diff --git a/Versions.cmake b/Versions.cmake
index 59af33460..f07339063 100644
--- a/Versions.cmake
+++ b/Versions.cmake
@@ -2,5 +2,5 @@
 set (WSJTX_VERSION_MAJOR 2)
 set (WSJTX_VERSION_MINOR 1)
 set (WSJTX_VERSION_PATCH 0)
-set (WSJTX_RC 5)		 # release candidate number, comment out or zero for development versions
+set (WSJTX_RC 6)		 # release candidate number, comment out or zero for development versions
 set (WSJTX_VERSION_IS_RELEASE 0) # set to 1 for final release build
diff --git a/lib/azdist.f90 b/lib/azdist.f90
index 2fd26c3d7..41a8fc5bc 100644
--- a/lib/azdist.f90
+++ b/lib/azdist.f90
@@ -1,7 +1,7 @@
-subroutine azdist(grid1,grid2,utch,nAz,nEl,nDmiles,nDkm,nHotAz,nHotABetter)
+subroutine azdist(MyGrid,HisGrid,utch,nAz,nEl,nDmiles,nDkm,nHotAz,nHotABetter)
 
-  character*(*) grid1,grid2
-  character*6 MyGrid,HisGrid,mygrid0,hisgrid0
+  character(len=*) :: MyGrid,HisGrid
+  character*6 mygrid0,hisgrid0
   real*8 utch,utch0
   logical HotABetter,IamEast
   real eltab(22),daztab(22)
@@ -12,11 +12,6 @@ subroutine azdist(grid1,grid2,utch,nAz,nEl,nDmiles,nDkm,nHotAz,nHotABetter)
   data mygrid0/"      "/,hisgrid0/"      "/,utch0/-999.d0/
   save
 
-  MyGrid=grid1//'  '
-  HisGrid=grid2//'  '
-  if(ichar(MyGrid(5:5)).eq.0)  MyGrid(5:6)='  '
-  if(ichar(HisGrid(5:5)).eq.0) HisGrid(5:6)='  '
-
   if(MyGrid.eq.HisGrid) then
      naz=0
      nel=0
diff --git a/widgets/logqso.cpp b/widgets/logqso.cpp
index eae82aacc..b4b936d75 100644
--- a/widgets/logqso.cpp
+++ b/widgets/logqso.cpp
@@ -41,6 +41,7 @@ LogQSO::LogQSO(QString const& programTitle, QSettings * settings
 
   ok_->setAutoDefault (false);
   ok_->setFocusPolicy (Qt::ClickFocus);
+  ok_->setStyleSheet ("background-color: green");
   cancel_->setAutoDefault (false);
   ui->button_layout->addStretch ();
   ui->button_layout->addWidget (ok_);
diff --git a/widgets/mainwindow.cpp b/widgets/mainwindow.cpp
index 28823dab8..813b163ce 100644
--- a/widgets/mainwindow.cpp
+++ b/widgets/mainwindow.cpp
@@ -3341,7 +3341,7 @@ void MainWindow::pskPost (DecodedText const& decodedtext)
   QString grid;
   decodedtext.deCallAndGrid(/*out*/deCall,grid);
   int audioFrequency = decodedtext.frequencyOffset();
-  if(m_mode=="FT8" or m_mode=="MSK144") {
+  if(m_mode=="FT8" or m_mode=="MSK144" or m_mode=="FT4") {
     audioFrequency=decodedtext.string().mid(16,4).toInt();
   }
   int snr = decodedtext.snr();
@@ -7549,8 +7549,8 @@ void MainWindow::p1ReadFromStdout()                        //p1readFromStdout
       if(grid!="") {
         double utch=0.0;
         int nAz,nEl,nDmiles,nDkm,nHotAz,nHotABetter;
-        azdist_(const_cast <char *> (m_config.my_grid ().toLatin1().constData()),
-                const_cast <char *> (grid.toLatin1().constData()),&utch,
+        azdist_(const_cast <char *> ((m_config.my_grid () + "      ").left (6).toLatin1 ().constData ()),
+                const_cast <char *> ((grid + "      ").left (6).toLatin1 ().constData ()),&utch,
                 &nAz,&nEl,&nDmiles,&nDkm,&nHotAz,&nHotABetter,6,6);
         QString t1;
         if(m_config.miles()) {