diff --git a/Transceiver/DXLabSuiteCommanderTransceiver.cpp b/Transceiver/DXLabSuiteCommanderTransceiver.cpp
index 7991d3e82..8dca88520 100644
--- a/Transceiver/DXLabSuiteCommanderTransceiver.cpp
+++ b/Transceiver/DXLabSuiteCommanderTransceiver.cpp
@@ -149,7 +149,7 @@ void DXLabSuiteCommanderTransceiver::do_stop ()
 
 void DXLabSuiteCommanderTransceiver::do_ptt (bool on)
 {
-  CAT_TRACE (on << state ());
+  CAT_TRACE (on << ' ' << state ());
   if (use_for_ptt_)
     {
       simple_command (on  ? "<command:5>CmdTX<parameters:0>" : "<command:5>CmdRX<parameters:0>");
@@ -204,7 +204,7 @@ void DXLabSuiteCommanderTransceiver::do_ptt (bool on)
 
 void DXLabSuiteCommanderTransceiver::do_frequency (Frequency f, MODE m, bool /*no_ignore*/)
 {
-  CAT_TRACE (f << state ());
+  CAT_TRACE (f << ' ' << state ());
   auto f_string = frequency_to_string (f);
   if (UNK != m && m != get_mode ())
     {
@@ -223,7 +223,7 @@ void DXLabSuiteCommanderTransceiver::do_frequency (Frequency f, MODE m, bool /*n
 
 void DXLabSuiteCommanderTransceiver::do_tx_frequency (Frequency tx, MODE mode, bool /*no_ignore*/)
 {
-  CAT_TRACE (tx << state ());
+  CAT_TRACE (tx << ' ' << state ());
   if (tx)
     {
       auto f_string = frequency_to_string (tx);
@@ -244,7 +244,7 @@ void DXLabSuiteCommanderTransceiver::do_tx_frequency (Frequency tx, MODE mode, b
 
 void DXLabSuiteCommanderTransceiver::do_mode (MODE m)
 {
-  CAT_TRACE (m << state ());
+  CAT_TRACE (m << ' ' << state ());
   auto m_string = map_mode (m);
   auto params =  ("<1:%1>" + m_string).arg (m_string.size ());
   simple_command (("<command:10>CmdSetMode<parameters:%1>" + params).arg (params.size ()));
@@ -444,7 +444,7 @@ QString DXLabSuiteCommanderTransceiver::command_with_reply (QString const& cmd)
   //     qDebug () << i << ":" << hex << int (result[i]);
   //   }
 
-  CAT_TRACE (cmd << "->" << QString {result});
+  CAT_TRACE (cmd << " -> " << QString {result});
   return result;                // converting raw UTF-8 bytes to QString
 }
 
diff --git a/Transceiver/Transceiver.cpp b/Transceiver/Transceiver.cpp
index e240d151f..5d97f0110 100644
--- a/Transceiver/Transceiver.cpp
+++ b/Transceiver/Transceiver.cpp
@@ -27,7 +27,7 @@ std::ostream& operator << (std::ostream& os, Transceiver::TransceiverState const
 {
   return os
     << "Transceiver::TransceiverState(online: " << (s.online_ ? "yes" : "no")
-    << " Frequency {" << s.rx_frequency_ << "Hz, " << s.tx_frequency_ << "Hz} " << s.mode_
+    << " Frequency {" << s.rx_frequency_ << "Hz, " << s.tx_frequency_ << "Hz} Mode: " << s.mode_
     << "; SPLIT: " << (Transceiver::TransceiverState::Split::on == s.split_ ? "on" : Transceiver::TransceiverState::Split::off == s.split_ ? "off" : "unknown")
     << "; PTT: " << (s.ptt_ ? "on" : "off")
     << ')';