diff --git a/devsetup.cpp b/devsetup.cpp
index 4daa70a8d..1264ff593 100644
--- a/devsetup.cpp
+++ b/devsetup.cpp
@@ -14,7 +14,9 @@ DevSetup::DevSetup(QWidget *parent) :	QDialog(parent)
   m_restartSoundOut=false;
   m_firstCall=true;
   m_iptt=0;
+  m_test=0;
   m_bRigOpen=false;
+  m_COMportOpen=0;
 }
 
 DevSetup::~DevSetup()
@@ -412,10 +414,9 @@ void DevSetup::on_testCATButton_clicked()
 void DevSetup::on_testPTTButton_clicked()
 {
   int iret=0;
-  m_iptt=1-m_iptt;
+  m_test=1-m_test;
   if(m_pttMethodIndex==1 or m_pttMethodIndex==2) {
-    int iptt=m_iptt;
-    ptt(m_pttPort,iptt,&m_iptt,&m_COMportOpen);
+    ptt(m_pttPort,m_test,&m_iptt,&m_COMportOpen);
   }
   if(m_pttMethodIndex==0 and m_bRigOpen) {
     rig->setPTT((ptt_t)m_iptt, RIG_VFO_CURR);
diff --git a/devsetup.h b/devsetup.h
index 8df29f5b2..c9186f6ec 100644
--- a/devsetup.h
+++ b/devsetup.h
@@ -36,6 +36,7 @@ public:
   qint32  m_stopBitsIndex;
   qint32  m_handshakeIndex;
   qint32  m_iptt;
+  qint32  m_test;
   qint32  m_COMportOpen;
 
   bool    m_restartSoundIn;
diff --git a/lib/unpackmsg.f90 b/lib/unpackmsg.f90
index c71256740..aca7cfc6b 100644
--- a/lib/unpackmsg.f90
+++ b/lib/unpackmsg.f90
@@ -39,6 +39,10 @@ subroutine unpackmsg(dat,msg)
 
   if(iv2.gt.0) then
 ! This is a JT65v2 message
+     do i=1,4
+        if(ichar(psfx(i:i)).eq.0) psfx(i:i)=' '
+     enddo
+
      n1=len_trim(psfx)
      n2=len_trim(c2)
      if(iv2.eq.1) msg='CQ '//psfx(:n1)//'/'//c2(:n2)//' '//grid
diff --git a/mainwindow.cpp b/mainwindow.cpp
index 63d0c13c2..79d21dfe4 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -1,4 +1,4 @@
-//--------------------------------------------------------------- MainWindow
+//---------------------------------------------------------------- MainWindow
 #include "mainwindow.h"
 #include "ui_mainwindow.h"
 #include "devsetup.h"
@@ -36,10 +36,6 @@ MainWindow::MainWindow(QSharedMemory *shdmem, QWidget *parent) :
   ui->setupUi(this);
 
   on_EraseButton_clicked();
-  ui->labUTC->setStyleSheet( \
-        "QLabel { background-color : black; color : yellow; }");
-  ui->labDialFreq->setStyleSheet( \
-        "QLabel { background-color : black; color : yellow; }");
   QActionGroup* paletteGroup = new QActionGroup(this);
   ui->actionCuteSDR->setActionGroup(paletteGroup);
   ui->actionLinrad->setActionGroup(paletteGroup);
@@ -300,6 +296,10 @@ MainWindow::MainWindow(QSharedMemory *shdmem, QWidget *parent) :
 
   ui->label_9->setStyleSheet("QLabel{background-color: #aabec8}");
   ui->label_10->setStyleSheet("QLabel{background-color: #aabec8}");
+  ui->labUTC->setStyleSheet( \
+        "QLabel { background-color : black; color : yellow; }");
+  ui->labDialFreq->setStyleSheet( \
+        "QLabel { background-color : black; color : yellow; }");
 //  ui->frame->hide();
 }                                          // End of MainWindow constructor
 
@@ -841,6 +841,14 @@ void MainWindow::dialFreqChanged2(double f)
   t.sprintf("%.6f",m_dialFreq);
   int n=t.length();
   t=t.mid(0,n-3) + " " + t.mid(n-3,3);
+  if(qAbs(m_dialFreq-dFreq[m_band])<0.01) {
+    ui->labDialFreq->setStyleSheet( \
+        "QLabel { background-color : black; color : yellow; }");
+  } else {
+    ui->labDialFreq->setStyleSheet( \
+          "QLabel { background-color : red; color : yellow; }");
+    ui->labDialFreq->setText(t);
+  }
   ui->labDialFreq->setText(t);
   statusChanged();
 }