diff --git a/src/rtos/hwthread.c b/src/rtos/hwthread.c
index b7d5c5f58..4902e0239 100644
--- a/src/rtos/hwthread.c
+++ b/src/rtos/hwthread.c
@@ -211,7 +211,7 @@ static int hwthread_update_threads(struct rtos *rtos)
 	else
 		rtos->current_thread = threadid_from_target(target);
 
-	LOG_DEBUG("%s current_thread=%i", __func__, (int)rtos->current_thread);
+	LOG_DEBUG("current_thread=%i, threads_found=%d", (int)rtos->current_thread, threads_found);
 	return 0;
 }
 
diff --git a/src/server/gdb_server.c b/src/server/gdb_server.c
index 086fd1121..4536e5c68 100644
--- a/src/server/gdb_server.c
+++ b/src/server/gdb_server.c
@@ -3736,7 +3736,8 @@ static int gdb_input_inner(struct connection *connection)
 					target_call_event_callbacks(target, TARGET_EVENT_GDB_HALT);
 				gdb_con->ctrl_c = false;
 			} else {
-				LOG_INFO("The target is not running when halt was requested, stopping GDB.");
+				LOG_TARGET_INFO(target, "Not running when halt was requested, stopping GDB. (state=%d)",
+						target->state);
 				target_call_event_callbacks(target, TARGET_EVENT_GDB_HALT);
 			}
 		}