diff --git a/transceiveradjustments.cpp b/transceiveradjustments.cpp
index 309cd43..8298bb8 100644
--- a/transceiveradjustments.cpp
+++ b/transceiveradjustments.cpp
@@ -47,7 +47,7 @@ void transceiverAdjustments::on_IFShiftSlider_valueChanged(int value)
         unsigned char outer = ui->TPBFOuterSlider->value();
         int shift = value - previousIFShift;
         inner = qMax( 0, qMin(255,int (inner + shift)) );
-        outer =qMax( 0, qMin(255,int (outer + shift)) );
+        outer = qMax( 0, qMin(255,int (outer + shift)) );
 
         ui->TPBFInnerSlider->setValue(inner);
         ui->TPBFOuterSlider->setValue(outer);
diff --git a/wfmain.cpp b/wfmain.cpp
index 0d9ecae..3c0403b 100644
--- a/wfmain.cpp
+++ b/wfmain.cpp
@@ -2234,14 +2234,22 @@ void wfmain:: getInitialRigState()
     issueDelayedCommand(cmdGetMode);
 
     // From left to right in the UI:
-    issueDelayedCommand(cmdGetDataMode);
-    issueDelayedCommand(cmdGetModInput);
-    issueDelayedCommand(cmdGetModDataInput);
+    if (rigCaps.hasTransmit) 
+    {
+        issueDelayedCommand(cmdGetDataMode);
+        issueDelayedCommand(cmdGetModInput);
+        issueDelayedCommand(cmdGetModDataInput);
+    }
     issueDelayedCommand(cmdGetRxGain);
     issueDelayedCommand(cmdGetAfGain);
     issueDelayedCommand(cmdGetSql);
-    issueDelayedCommand(cmdGetTxPower);
-    issueDelayedCommand(cmdGetCurrentModLevel); // level for currently selected mod sources
+    
+    if (rigCaps.hasTransmit) 
+    {
+        issueDelayedCommand(cmdGetTxPower);
+        issueDelayedCommand(cmdGetCurrentModLevel); // level for currently selected mod sources
+    }
+    
     issueDelayedCommand(cmdGetSpectrumRefLevel);
     issueDelayedCommand(cmdGetDuplexMode);
 
@@ -2250,8 +2258,12 @@ void wfmain:: getInitialRigState()
         issueDelayedCommand(cmdDispEnable);
         issueDelayedCommand(cmdSpecOn);
     }
-    issueDelayedCommand(cmdGetModInput);
-    issueDelayedCommand(cmdGetModDataInput);
+
+    if (rigCaps.hasTransmit)
+    {
+        issueDelayedCommand(cmdGetModInput);
+        issueDelayedCommand(cmdGetModDataInput);
+    }
 
     if(rigCaps.hasCTCSS)
     {
@@ -3524,8 +3536,10 @@ void wfmain::receiveMode(unsigned char mode, unsigned char filter)
 
     // Note: we need to know if the DATA mode is active to reach mode-D
     // some kind of queued query:
-    if(rigCaps.hasDataModes)
+    if (rigCaps.hasDataModes && rigCaps.hasTransmit)
+    {
         issueDelayedCommand(cmdGetDataMode);
+    }
 }
 
 void wfmain::receiveDataModeStatus(bool dataEnabled)