diff --git a/scst/src/scst_lib.c b/scst/src/scst_lib.c
index 93d6477e7..131bf2a57 100644
--- a/scst/src/scst_lib.c
+++ b/scst/src/scst_lib.c
@@ -7742,19 +7742,18 @@ int scst_set_pending_UA(struct scst_cmd *cmd, uint8_t *buf, int *size)
 		goto out;
 	}
 
-	TRACE_MGMT_DBG("Setting pending UA cmd %p (dev %s, initiator %s)", cmd,
-		cmd->dev->virt_name, cmd->sess->initiator_name);
-
 	spin_lock_bh(&cmd->tgt_dev->tgt_dev_lock);
 
 again:
 	/* UA list could be cleared behind us, so retest */
 	if (list_empty(&cmd->tgt_dev->UA_list)) {
-		TRACE_DBG("%s",
-		      "SCST_TGT_DEV_UA_PENDING set, but UA_list empty");
+		TRACE_DBG("SCST_TGT_DEV_UA_PENDING set, but UA_list empty");
 		res = -1;
 		goto out_unlock;
-	}
+	} else
+		TRACE_MGMT_DBG("Setting pending UA cmd %p (tgt_dev %p, dev %s, "
+			"initiator %s)", cmd->tgt_dev, cmd, cmd->dev->virt_name,
+			cmd->sess->initiator_name);
 
 	UA_entry = list_first_entry(&cmd->tgt_dev->UA_list, typeof(*UA_entry),
 			      UA_list_entry);
@@ -7898,7 +7897,8 @@ static void scst_alloc_set_UA(struct scst_tgt_dev *tgt_dev,
 
 	set_bit(SCST_TGT_DEV_UA_PENDING, &tgt_dev->tgt_dev_flags);
 
-	TRACE_MGMT_DBG("Adding new UA to tgt_dev %p", tgt_dev);
+	TRACE_MGMT_DBG("Adding new UA to tgt_dev %p (dev %s, initiator %s)",
+		tgt_dev, tgt_dev->dev->virt_name, tgt_dev->sess->initiator_name);
 
 	if (flags & SCST_SET_UA_FLAG_AT_HEAD)
 		list_add(&UA_entry->UA_list_entry, &tgt_dev->UA_list);
diff --git a/scst/src/scst_main.c b/scst/src/scst_main.c
index 818532e5f..2ad062121 100644
--- a/scst/src/scst_main.c
+++ b/scst/src/scst_main.c
@@ -806,8 +806,9 @@ int scst_suspend_activity(unsigned long timeout)
 	/* See comment about smp_mb() above */
 	smp_mb__after_clear_bit();
 
-	TRACE_MGMT_DBG("Waiting for %d active commands finally to complete",
-		scst_get_cmd_counter());
+	if (scst_get_cmd_counter() != 0)
+		TRACE_MGMT_DBG("Waiting for %d active commands finally to "
+			"complete", scst_get_cmd_counter());
 
 	if (timeout != SCST_SUSPEND_TIMEOUT_UNLIMITED) {
 		wait_time = jiffies - cur_time;