diff --git a/devsetup.cpp b/devsetup.cpp
index 88da846d0..395050099 100644
--- a/devsetup.cpp
+++ b/devsetup.cpp
@@ -337,9 +337,7 @@ void DevSetup::on_cbPSKReporter_clicked(bool b)
 void DevSetup::on_pttMethodComboBox_activated(int index)
 {
   m_pttMethodIndex=index;
-  bool b=m_pttMethodIndex==1 or m_pttMethodIndex==2 or
-      (m_catEnabled and m_pttMethodIndex==0 and m_rig!=9999);
-  ui.testPTTButton->setEnabled(b);
+  enableWidgets();
 }
 
 void DevSetup::on_catPortComboBox_activated(int index)
@@ -526,6 +524,6 @@ void DevSetup::enableWidgets()
   ui.pollSpinBox->setEnabled(m_catEnabled);
   bool b=(m_pttMethodIndex==1 or m_pttMethodIndex==2) and m_rig!=9999;
   ui.pttComboBox->setEnabled(b);
-  b=b or m_catEnabled;
+  b=b or (m_catEnabled and m_pttMethodIndex==0);
   ui.testPTTButton->setEnabled(b);
 }
diff --git a/getfile.cpp b/getfile.cpp
index 59a1729ac..bb739f059 100644
--- a/getfile.cpp
+++ b/getfile.cpp
@@ -121,50 +121,6 @@ float gran()
   return v2*fac;
 }
 
-/*
-int ptt(int nport, int ntx, int *iptt)
-{
-#ifdef WIN32
-  static HANDLE hFile;
-  static int open=0;
-  char s[10];
-  int i3=1,i4=1,i5=1,i6=1,i9=1,i00=1;
-
-  if(nport==0) {
-    *iptt=ntx;
-    return(0);
-  }
-
-  if(ntx && (!open)) {
-    sprintf(s,"\\\\.\\COM%d",nport);
-    hFile=CreateFile(TEXT(s),GENERIC_WRITE,0,NULL,OPEN_EXISTING,
-                     FILE_ATTRIBUTE_NORMAL,NULL);
-    if(hFile==INVALID_HANDLE_VALUE) {
-      //      printf("PTT: Cannot open COM port %d.\n",nport);
-      return 1;
-    }
-    open=1;
-  }
-
-  if(ntx && open) {
-    i3=EscapeCommFunction(hFile,SETRTS);
-    i5=EscapeCommFunction(hFile,SETDTR);
-    *iptt=1;
-  }
-
-  else {
-    i4=EscapeCommFunction(hFile,CLRRTS);
-    i6=EscapeCommFunction(hFile,CLRDTR);
-    i9=EscapeCommFunction(hFile,CLRBREAK);
-    i00=CloseHandle(hFile);
-    *iptt=0;
-    open=0;
-  }
-  return 0;
-#endif
-}
-*/
-
 int ptt(int nport, int ntx, int* iptt, int* nopen)
 {
 #ifdef WIN32
@@ -206,8 +162,3 @@ int ptt(int nport, int ntx, int* iptt, int* nopen)
   return 0;
 #endif
 }
-
-int hamlibError(int retcode)
-{
-  qDebug() << "Hamlib error" << retcode;
-}
diff --git a/lib/jt9.f90 b/lib/jt9.f90
index bc922eb47..1f01a11e5 100644
--- a/lib/jt9.f90
+++ b/lib/jt9.f90
@@ -43,8 +43,6 @@ program jt9
   nfb=2000
   mousefqso=1500
   newdat=1
-  nb=0
-  nbslider=30
   ndiskdat=1
 
   do ifile=ifile1,nargs
diff --git a/mainwindow.cpp b/mainwindow.cpp
index 9282be7b9..addd500b4 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -1,4 +1,4 @@
-//-------------------------------------------------------------- MainWindow
+//------------------------------------------------------------- MainWindow
 #include "mainwindow.h"
 #include "ui_mainwindow.h"
 #include "devsetup.h"
diff --git a/rigclass.cpp b/rigclass.cpp
index 4a2647eef..286d566f5 100644
--- a/rigclass.cpp
+++ b/rigclass.cpp
@@ -176,7 +176,22 @@ vfo_t Rig::getVFO()
 
 int Rig::setPTT(ptt_t ptt, vfo_t vfo)
 {
-  return rig_set_ptt(theRig, vfo, ptt);
+  if(m_hrd) {
+#ifdef WIN32
+    const wchar_t* cmnd = (const wchar_t*) (m_context +
+       "Set Button-Select Send 1").utf16();
+    const wchar_t* result=HRDInterfaceSendMessage(cmnd);
+    QString t2=QString::fromWCharArray (result,-1);
+    HRDInterfaceFreeString(result);
+    if(t2=="OK") {
+      return 0;
+    } else {
+      return -1;
+    }
+#endif
+  } else {
+    return rig_set_ptt(theRig, vfo, ptt);
+  }
 }
 
 ptt_t Rig::getPTT(vfo_t vfo)