diff --git a/src/platforms/pc-stlinkv2/stlinkv2.c b/src/platforms/pc-stlinkv2/stlinkv2.c
index 2fdde1fb..7793ab44 100644
--- a/src/platforms/pc-stlinkv2/stlinkv2.c
+++ b/src/platforms/pc-stlinkv2/stlinkv2.c
@@ -232,7 +232,7 @@ stlink Stlink;
 static void exit_function(void)
 {
 	libusb_exit(NULL);
-	DEBUG("\nCleanup\n");
+	DEBUG("Cleanup\n");
 }
 
 /* SIGTERM handler. */
diff --git a/src/platforms/pc/cl_utils.c b/src/platforms/pc/cl_utils.c
index f2cef514..40a8f9ad 100644
--- a/src/platforms/pc/cl_utils.c
+++ b/src/platforms/pc/cl_utils.c
@@ -228,6 +228,14 @@ void cl_init(BMP_CL_OPTIONS_t *opt, int argc, char **argv)
 	}
 }
 
+static void display_target(int i, target *t, void *context)
+{
+	(void)context;
+	DEBUG("*** %2d   %c  %s %s\n", i, target_attached(t)?'*':' ',
+		  target_driver_name(t),
+		  (target_core_name(t)) ? target_core_name(t): "");
+}
+
 int cl_execute(BMP_CL_OPTIONS_t *opt)
 {
 	int res = -1;
@@ -253,6 +261,8 @@ int cl_execute(BMP_CL_OPTIONS_t *opt)
 	if (!num_targets) {
 		DEBUG("No target found\n");
 		return res;
+	} else {
+		target_foreach(display_target, NULL);
 	}
 	if (opt->opt_mode == BMP_MODE_TEST)
 			return 0;
diff --git a/src/target/adiv5.c b/src/target/adiv5.c
index c037f403..a0e5ff39 100644
--- a/src/target/adiv5.c
+++ b/src/target/adiv5.c
@@ -235,7 +235,6 @@ void adiv5_dp_unref(ADIv5_DP_t *dp)
 void adiv5_ap_unref(ADIv5_AP_t *ap)
 {
 	if (--(ap->refcnt) == 0) {
-		DEBUG("Unref AP\n");
 		adiv5_dp_unref(ap->dp);
 		free(ap);
 	}