diff --git a/lib/jt65.f90 b/lib/jt65.f90
index 23777155b..10f7525ac 100644
--- a/lib/jt65.f90
+++ b/lib/jt65.f90
@@ -12,7 +12,7 @@ program jt65
   common/hdr/ariff,lenfile,awave,afmt,lenfmt,nfmt2,nchan2, &
      nsamrate,nbytesec,nbytesam2,nbitsam2,adata,ndata
   common/tracer/limtrace,lu
-  equivalence (ariff,ihdr)
+  equivalence (lenfile,ihdr(2))
 
   nargs=iargc()
   if(nargs.lt.1) then
diff --git a/mainwindow.cpp b/mainwindow.cpp
index 71d6e79fe..004810a5c 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -1,4 +1,4 @@
-//---------------------------------------------------------------- MainWindow
+//--------------------------------------------------------------- MainWindow
 #include "mainwindow.h"
 #include "ui_mainwindow.h"
 #include "devsetup.h"
@@ -797,10 +797,15 @@ void MainWindow::on_actionDeviceSetup_triggered()               //Setup Dialog
     m_bSplit=dlg.m_bSplit;
     m_bXIT=dlg.m_bXIT;
     if(m_bSplit or m_bXIT) setXIT(m_txFreq);
-    int ret;
-    if(m_bRigOpen and !m_bSplit) ret=rig->setSplitFreq(MHz(m_dialFreq),RIG_VFO_B);
+    if(m_bRigOpen and !m_bSplit) {
+      int ret=rig->setSplitFreq(MHz(m_dialFreq),RIG_VFO_B);
+      if(ret!=RIG_OK) {
+        QString rt;
+        rt.sprintf("Setting VFO_B failed:  %d",ret);
+        msgBox(rt);
+      }
+    }
   }
-
 }
 
 void MainWindow::on_monitorButton_clicked()                  //Monitor
@@ -2973,7 +2978,11 @@ void MainWindow::setXIT(int n)
     if(m_bXIT) {
       ret=rig->setXit((shortfreq_t)xit,RIG_VFO_TX);
 //      ret=rig->setSplitFreq(MHz(m_dialFreq),RIG_VFO_A);
-
+      if(ret!=RIG_OK) {
+        QString rt;
+        rt.sprintf("Setting RIG_VFO_TX failed:  %d",ret);
+        msgBox(rt);
+      }
     }
     if(m_bSplit) ret=rig->setSplitFreq(MHz(m_dialFreq)+xit,RIG_VFO_B);
   }