diff --git a/icom/frame.c b/icom/frame.c
index 51b72f4d6..ca85a5d17 100644
--- a/icom/frame.c
+++ b/icom/frame.c
@@ -166,7 +166,9 @@ int icom_one_transaction(RIG *rig, int cmd, int subcmd,
             Unhold_Decode(rig);
             return retval;
         }
-        if (retval < 1) {
+
+        if (retval < 1)
+        {
             return -RIG_EPROTO;
         }
 
@@ -230,7 +232,9 @@ int icom_one_transaction(RIG *rig, int cmd, int subcmd,
         /* other error: return it */
         return frm_len;
     }
-    if (frm_len < 1) {
+
+    if (frm_len < 1)
+    {
         return -RIG_EPROTO;
     }
 
@@ -466,6 +470,9 @@ void icom2rig_mode(RIG *rig, unsigned char md, int pd, rmode_t *mode,
 {
     *width = RIG_PASSBAND_NORMAL;
 
+    if (md == RIG_MODE_PKTUSB) { md = RIG_MODE_USB; }
+    else if (md == RIG_MODE_PKTLSB) { md = RIG_MODE_LSB; }
+
     switch (md)
     {
     case S_AM:  if (rig->caps->rig_model == RIG_MODEL_ICR30 && pd == 0x02)
diff --git a/icom/icom.c b/icom/icom.c
index 7fc5b6531..4e095e1e9 100644
--- a/icom/icom.c
+++ b/icom/icom.c
@@ -1202,7 +1202,7 @@ int icom_set_mode_with_data(RIG *rig, vfo_t vfo, rmode_t mode,
         }
 
         if (filter_byte) { // then we need the width byte too
-            rmode_t mode2;
+            rmode_t mode2; // not used as it will map to USB/LSB
             pbwidth_t width2;
             icom2rig_mode(rig, mode, width, &mode2, &width2); 
             datamode[1] = datamode[1] ? width2 : 0;
diff --git a/icom/icom.h b/icom/icom.h
index cf4c5e4e7..c8c28b9c3 100644
--- a/icom/icom.h
+++ b/icom/icom.h
@@ -30,7 +30,7 @@
 #include <sys/time.h>
 #endif
 
-#define BACKEND_VER "0.20"
+#define BACKEND_VER "0.21"
 
 /*
  * defines used by comp_cal_str in rig.c