diff --git a/src/jtag/drivers/ftdi.c b/src/jtag/drivers/ftdi.c
index da4ea20b9..34b42b81b 100644
--- a/src/jtag/drivers/ftdi.c
+++ b/src/jtag/drivers/ftdi.c
@@ -657,7 +657,6 @@ static void ftdi_execute_command(struct jtag_command *cmd)
 {
 	switch (cmd->type) {
 		case JTAG_RESET:
-			ftdi_execute_reset(cmd);
 #if BUILD_FTDI_OSCAN1 == 1
 			oscan1_reset_online_activate(); /* put the target back into OSCAN1 mode */
 #endif
diff --git a/src/rtos/hwthread.c b/src/rtos/hwthread.c
index cdcf026c3..65b89c402 100644
--- a/src/rtos/hwthread.c
+++ b/src/rtos/hwthread.c
@@ -408,7 +408,7 @@ int hwthread_read_buffer(struct rtos *rtos, target_addr_t address,
 
 	struct target *target = rtos->target;
 
-	struct target *curr = find_thread(target, rtos->current_thread);
+	struct target *curr = hwthread_find_thread(target, rtos->current_thread);
 	if (curr == NULL)
 		return ERROR_FAIL;
 
@@ -423,7 +423,7 @@ int hwthread_write_buffer(struct rtos *rtos, target_addr_t address,
 
 	struct target *target = rtos->target;
 
-	struct target *curr = find_thread(target, rtos->current_thread);
+	struct target *curr = hwthread_find_thread(target, rtos->current_thread);
 	if (curr == NULL)
 		return ERROR_FAIL;