diff --git a/rigs/icom/ic7000.c b/rigs/icom/ic7000.c
index 0cd74e694..780353345 100644
--- a/rigs/icom/ic7000.c
+++ b/rigs/icom/ic7000.c
@@ -221,8 +221,6 @@ struct rig_caps ic7000_caps =
     .level_gran =
     {
 #include "level_gran_icom.h"
-        [LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 255 } },
-        [LVL_VOXDELAY] = { .min = { .i = 0 }, .max = { .i = 20 }, .step = { .i = 1 } },
         [LVL_KEYSPD] = { .min = { .i = 6 }, .max = { .i = 48 }, .step = { .i = 1 } },
         [LVL_CWPITCH] = { .min = { .i = 300 }, .max = { .i = 900 }, .step = { .i = 1 } },
     },
diff --git a/rigs/icom/ic703.c b/rigs/icom/ic703.c
index 5fe2534f9..fa1f16d39 100644
--- a/rigs/icom/ic703.c
+++ b/rigs/icom/ic703.c
@@ -112,7 +112,6 @@ struct rig_caps ic703_caps =
     .level_gran =
     {
 #include "level_gran_icom.h"
-        [LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 255 } },
     },
     .parm_gran =  {},
     .ctcss_list =  common_ctcss_list,
diff --git a/rigs/icom/ic7100.c b/rigs/icom/ic7100.c
index 8cf36a268..7dd017e93 100644
--- a/rigs/icom/ic7100.c
+++ b/rigs/icom/ic7100.c
@@ -342,8 +342,6 @@ struct rig_caps ic7100_caps =
     .level_gran =
     {
 #include "level_gran_icom.h"
-        [LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 255 } },
-        [LVL_VOXDELAY] = { .min = { .i = 0 }, .max = { .i = 20 }, .step = { .i = 1 } },
         [LVL_KEYSPD] = { .min = { .i = 6 }, .max = { .i = 48 }, .step = { .i = 1 } },
         [LVL_CWPITCH] = { .min = { .i = 300 }, .max = { .i = 900 }, .step = { .i = 1 } },
     },
diff --git a/rigs/icom/ic718.c b/rigs/icom/ic718.c
index e2b40ff88..363748305 100644
--- a/rigs/icom/ic718.c
+++ b/rigs/icom/ic718.c
@@ -103,7 +103,6 @@ struct rig_caps ic718_caps =
     .level_gran =
     {
 #include "level_gran_icom.h"
-        [LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 255 } },
     },
     .parm_gran =  {},
     .str_cal = IC718_STR_CAL,
diff --git a/rigs/icom/ic7200.c b/rigs/icom/ic7200.c
index 1ed56584b..5e09c9b0d 100644
--- a/rigs/icom/ic7200.c
+++ b/rigs/icom/ic7200.c
@@ -149,8 +149,6 @@ struct rig_caps ic7200_caps =
     .level_gran =
     {
 #include "level_gran_icom.h"
-        [LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 255 } },
-        [LVL_VOXDELAY] = { .min = { .i = 0 }, .max = { .i = 20 }, .step = { .i = 1 } },
         [LVL_KEYSPD] = { .min = { .i = 6 }, .max = { .i = 48 }, .step = { .i = 1 } },
         [LVL_CWPITCH] = { .min = { .i = 300 }, .max = { .i = 900 }, .step = { .i = 1 } },
     },
diff --git a/rigs/icom/ic7300.c b/rigs/icom/ic7300.c
index 5d74f8fff..a991cee25 100644
--- a/rigs/icom/ic7300.c
+++ b/rigs/icom/ic7300.c
@@ -719,8 +719,6 @@ struct rig_caps ic7300_caps =
     .has_set_parm =  RIG_PARM_SET(IC7300_PARMS),
     .level_gran = {
 #include "level_gran_icom.h"
-        [LVL_RAWSTR] = {.min = {.i = 0}, .max = {.i = 255}},
-        [LVL_VOXDELAY] = {.min = {.i = 0}, .max = {.i = 20}, .step = {.i = 1}},
         [LVL_KEYSPD] = {.min = {.i = 6}, .max = {.i = 48}, .step = {.i = 1}},
         [LVL_CWPITCH] = {.min = {.i = 300}, .max = {.i = 900}, .step = {.i = 1}},
         [LVL_SPECTRUM_SPEED] = {.min = {.i = 0}, .max = {.i = 2}, .step = {.i = 1}},
@@ -967,8 +965,6 @@ struct rig_caps ic9700_caps =
     .has_set_parm =  RIG_PARM_SET(IC9700_PARMS),
     .level_gran = {
 #include "level_gran_icom.h"
-        [LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 255 } },
-        [LVL_VOXDELAY] = { .min = { .i = 0 }, .max = { .i = 20 }, .step = { .i = 1 } },
         [LVL_KEYSPD] = {.min = {.i = 6}, .max = {.i = 48}, .step = {.i = 1}},
         [LVL_CWPITCH] = {.min = {.i = 300}, .max = {.i = 900}, .step = {.i = 1}},
         [LVL_SPECTRUM_SPEED] = {.min = {.i = 0}, .max = {.i = 2}, .step = {.i = 1}},
@@ -1292,8 +1288,6 @@ struct rig_caps ic705_caps =
     .has_set_parm =  RIG_PARM_SET(IC7300_PARMS),
     .level_gran = {
 #include "level_gran_icom.h"
-        [LVL_RAWSTR] = {.min = {.i = 0}, .max = {.i = 255}},
-        [LVL_VOXDELAY] = {.min = {.i = 0}, .max = {.i = 20}, .step = {.i = 1}},
         [LVL_KEYSPD] = {.min = {.i = 6}, .max = {.i = 48}, .step = {.i = 1}},
         [LVL_CWPITCH] = {.min = {.i = 300}, .max = {.i = 900}, .step = {.i = 1}},
         [LVL_SPECTRUM_SPEED] = {.min = {.i = 0}, .max = {.i = 2}, .step = {.i = 1}},
@@ -1567,8 +1561,6 @@ struct rig_caps ic905_caps =
     .has_set_parm =  RIG_PARM_SET(IC7300_PARMS),
     .level_gran = {
 #include "level_gran_icom.h"
-        [LVL_RAWSTR] = {.min = {.i = 0}, .max = {.i = 255}},
-        [LVL_VOXDELAY] = {.min = {.i = 0}, .max = {.i = 20}, .step = {.i = 1}},
         [LVL_KEYSPD] = {.min = {.i = 6}, .max = {.i = 48}, .step = {.i = 1}},
         [LVL_CWPITCH] = {.min = {.i = 300}, .max = {.i = 900}, .step = {.i = 1}},
         [LVL_SPECTRUM_SPEED] = {.min = {.i = 0}, .max = {.i = 2}, .step = {.i = 1}},
@@ -2220,6 +2212,10 @@ int ic9700_set_vfo(RIG *rig, vfo_t vfo)
             retval = icom_transaction(rig, 0x07, subcmd, NULL, 0, ackbuf, &ack_len);
         }
     }
+    else if (vfo == RIG_VFO_MEM)
+    {
+        return icom_set_vfo(rig, vfo);
+    }
 
     if (retval != RIG_OK)
     {
diff --git a/rigs/icom/ic7410.c b/rigs/icom/ic7410.c
index 35fa5b3c2..fc8a41ddc 100644
--- a/rigs/icom/ic7410.c
+++ b/rigs/icom/ic7410.c
@@ -149,8 +149,6 @@ struct rig_caps ic7410_caps =
     .level_gran =
     {
 #include "level_gran_icom.h"
-        [LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 255 } },
-        [LVL_VOXDELAY] = { .min = { .i = 0 }, .max = { .i = 20 }, .step = { .i = 1 } },
         [LVL_KEYSPD] = { .min = { .i = 6 }, .max = { .i = 48 }, .step = { .i = 1 } },
         [LVL_CWPITCH] = { .min = { .i = 300 }, .max = { .i = 900 }, .step = { .i = 1 } },
     },
diff --git a/rigs/icom/ic746.c b/rigs/icom/ic746.c
index cf76b33b0..23d134bff 100644
--- a/rigs/icom/ic746.c
+++ b/rigs/icom/ic746.c
@@ -207,7 +207,6 @@ struct rig_caps ic746_caps =
     .level_gran =
     {
 #include "level_gran_icom.h"
-        [LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 255 } },
         [LVL_KEYSPD] = { .min = { .i = 6 }, .max = { .i = 48 }, .step = { .i = 1 } },
         [LVL_CWPITCH] = { .min = { .i = 300 }, .max = { .i = 900 }, .step = { .i = 1 } },
     },
@@ -443,7 +442,6 @@ struct rig_caps ic746pro_caps =
     .level_gran =
     {
 #include "level_gran_icom.h"
-        [LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 255 } },
     },
     .parm_gran =  {
         [PARM_BACKLIGHT] = {.min = {.f = 0.0f}, .max = {.f = 1.0f}, .step = {.f = 1.0f / 255.0f}},
diff --git a/rigs/icom/ic751.c b/rigs/icom/ic751.c
index 1028f33e8..a1352f616 100644
--- a/rigs/icom/ic751.c
+++ b/rigs/icom/ic751.c
@@ -111,7 +111,6 @@ struct rig_caps ic751_caps =
     .level_gran =
     {
 #include "level_gran_icom.h"
-        [LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 255 } },
     },
     .parm_gran =  {},
     .ctcss_list =  NULL,
diff --git a/rigs/icom/ic756.c b/rigs/icom/ic756.c
index 5c7bdb5ea..ae113b2a0 100644
--- a/rigs/icom/ic756.c
+++ b/rigs/icom/ic756.c
@@ -166,7 +166,6 @@ struct rig_caps ic756_caps =
     .level_gran =
     {
 #include "level_gran_icom.h"
-        [LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 255 } },
     },
     .parm_gran =  {},
     .ctcss_list =  common_ctcss_list,
@@ -331,7 +330,6 @@ struct rig_caps ic756pro_caps =
     .level_gran =
     {
 #include "level_gran_icom.h"
-        [LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 255 } },
         [LVL_KEYSPD] = { .min = { .i = 6 }, .max = { .i = 48 }, .step = { .i = 1 } },
         [LVL_CWPITCH] = { .min = { .i = 300 }, .max = { .i = 900 }, .step = { .i = 1 } },
     },
@@ -572,8 +570,6 @@ struct rig_caps ic756pro2_caps =
     .level_gran =
     {
 #include "level_gran_icom.h"
-        [LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 255 } },
-        [LVL_VOXDELAY] = { .min = { .i = 0 }, .max = { .i = 20 }, .step = { .i = 1 } },
         [LVL_KEYSPD] = { .min = { .i = 6 }, .max = { .i = 48 }, .step = { .i = 1 } },
         [LVL_CWPITCH] = { .min = { .i = 300 }, .max = { .i = 900 }, .step = { .i = 1 } },
     },
@@ -1008,8 +1004,6 @@ struct rig_caps ic756pro3_caps =
     .level_gran =
     {
 #include "level_gran_icom.h"
-        [LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 255 } },
-        [LVL_VOXDELAY] = { .min = { .i = 0 }, .max = { .i = 20 }, .step = { .i = 1 } },
         [LVL_KEYSPD] = { .min = { .i = 6 }, .max = { .i = 48 }, .step = { .i = 1 } },
         [LVL_CWPITCH] = { .min = { .i = 300 }, .max = { .i = 900 }, .step = { .i = 1 } },
     },
diff --git a/rigs/icom/ic7600.c b/rigs/icom/ic7600.c
index 89c0328d1..faf535a7c 100644
--- a/rigs/icom/ic7600.c
+++ b/rigs/icom/ic7600.c
@@ -303,8 +303,6 @@ struct rig_caps ic7600_caps =
     .level_gran =
     {
 #include "level_gran_icom.h"
-        [LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 255 } },
-        [LVL_VOXDELAY] = { .min = { .i = 0 }, .max = { .i = 20 }, .step = { .i = 1 } },
         [LVL_KEYSPD] = { .min = { .i = 6 }, .max = { .i = 48 }, .step = { .i = 1 } },
         [LVL_CWPITCH] = { .min = { .i = 300 }, .max = { .i = 900 }, .step = { .i = 1 } },
     },
diff --git a/rigs/icom/ic7610.c b/rigs/icom/ic7610.c
index 7463ebba2..4a7bc799f 100644
--- a/rigs/icom/ic7610.c
+++ b/rigs/icom/ic7610.c
@@ -144,7 +144,7 @@ struct cmdparams ic7610_extcmds[] =
 int ic7610_ext_tokens[] =
 {
     TOK_DRIVE_GAIN, TOK_DIGI_SEL_FUNC, TOK_DIGI_SEL_LEVEL,
-    TOK_SCOPE_MSS, TOK_SCOPE_SDS, TOK_SCOPE_STX, TOK_SCOPE_CFQ, TOK_SCOPE_EDG, TOK_SCOPE_VBW, TOK_SCOPE_RBW, TOK_SCOPE_MKP,TOK_IPP_FUNC,TOK_TX_INHIBIT_FUNC,TOK_DPP_FUNC,
+    TOK_SCOPE_MSS, TOK_SCOPE_SDS, TOK_SCOPE_STX, TOK_SCOPE_CFQ, TOK_SCOPE_EDG, TOK_SCOPE_VBW, TOK_SCOPE_RBW, TOK_SCOPE_MKP,TOK_IPP_FUNC,TOK_TX_INHIBIT_FUNC,TOK_DPP_FUNC,TOK_ICPW2_FUNC,
     TOK_BACKEND_NONE
 };
 
diff --git a/rigs/icom/ic7700.c b/rigs/icom/ic7700.c
index 0f43f01a1..103fb9193 100644
--- a/rigs/icom/ic7700.c
+++ b/rigs/icom/ic7700.c
@@ -284,8 +284,6 @@ struct rig_caps ic7700_caps =
     .level_gran =
     {
 #include "level_gran_icom.h"
-        [LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 255 } },
-        [LVL_VOXDELAY] = { .min = { .i = 0 }, .max = { .i = 20 }, .step = { .i = 1 } },
         [LVL_KEYSPD] = { .min = { .i = 6 }, .max = { .i = 48 }, .step = { .i = 1 } },
         [LVL_CWPITCH] = { .min = { .i = 300 }, .max = { .i = 900 }, .step = { .i = 1 } },
     },
diff --git a/rigs/icom/ic78.c b/rigs/icom/ic78.c
index 9cf9e898e..977e0ee2a 100644
--- a/rigs/icom/ic78.c
+++ b/rigs/icom/ic78.c
@@ -93,7 +93,6 @@ struct rig_caps ic78_caps =
     .level_gran =
     {
 #include "level_gran_icom.h"
-        [LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 255 } },
     },
     .parm_gran =  {},
     .preamp =   { 10, 20, RIG_DBLST_END, },
diff --git a/rigs/icom/ic7800.c b/rigs/icom/ic7800.c
index 93a826bb4..303016606 100644
--- a/rigs/icom/ic7800.c
+++ b/rigs/icom/ic7800.c
@@ -184,8 +184,6 @@ struct rig_caps ic7800_caps =
     .level_gran =
     {
 #include "level_gran_icom.h"
-        [LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 255 } },
-        [LVL_VOXDELAY] = { .min = { .i = 0 }, .max = { .i = 20 }, .step = { .i = 1 } },
         [LVL_KEYSPD] = { .min = { .i = 6 }, .max = { .i = 48 }, .step = { .i = 1 } },
         [LVL_CWPITCH] = { .min = { .i = 300 }, .max = { .i = 900 }, .step = { .i = 1 } },
     },
diff --git a/rigs/icom/ic910.c b/rigs/icom/ic910.c
index 8908f2e26..67c10ade9 100644
--- a/rigs/icom/ic910.c
+++ b/rigs/icom/ic910.c
@@ -227,8 +227,6 @@ struct rig_caps ic910_caps =
     .level_gran =
     {
 #include "level_gran_icom.h"
-        [LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 255 } },
-        [LVL_VOXDELAY] = { .min = { .i = 0 }, .max = { .i = 20 }, .step = { .i = 1 } },
     },
     .parm_gran =    {},
     .ctcss_list =  common_ctcss_list,
diff --git a/rigs/icom/ic9100.c b/rigs/icom/ic9100.c
index 5daaae1f2..d1a444ea8 100644
--- a/rigs/icom/ic9100.c
+++ b/rigs/icom/ic9100.c
@@ -135,8 +135,6 @@ struct rig_caps ic9100_caps =
     .level_gran =
     {
 #include "level_gran_icom.h"
-        [LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 255 } },
-        [LVL_VOXDELAY] = { .min = { .i = 0 }, .max = { .i = 20 }, .step = { .i = 1 } },
     },
     .parm_gran =  {
         [PARM_BACKLIGHT] = {.min = {.f = 0.0f}, .max = {.f = 1.0f}, .step = {.f = 1.0f / 255.0f}},
diff --git a/rigs/icom/ic92d.c b/rigs/icom/ic92d.c
index 59362a8f2..b0f3b6753 100644
--- a/rigs/icom/ic92d.c
+++ b/rigs/icom/ic92d.c
@@ -124,7 +124,6 @@ struct rig_caps ic92d_caps =
     .level_gran =
     {
 #include "level_gran_icom.h"
-        [LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 255 } },
     },
     .parm_gran =  {},
     .ctcss_list =  common_ctcss_list,
diff --git a/rigs/icom/icom.c b/rigs/icom/icom.c
index b15d72856..833f13f57 100644
--- a/rigs/icom/icom.c
+++ b/rigs/icom/icom.c
@@ -1398,6 +1398,11 @@ int icom_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
         cmd = 0x25;
         retval = icom_transaction(rig, cmd, subcmd, freqbuf, freq_len, ackbuf,
                                   &ack_len);
+        if (retval == -RIG_ERJCTED && vfo == RIG_VFO_MEM)
+        {
+            rig_debug(RIG_DEBUG_ERR, "%s: Rig is in MEM mode and MEM channel is empty\n", __func__);
+            return -RIG_ECONF;
+        }
     }
     else
     {
@@ -1801,8 +1806,14 @@ int icom_get_freq(RIG *rig, vfo_t vfo, freq_t *freq)
               __func__, freq_len);
 
         if (vfo == RIG_VFO_MEM && civ_731_mode) { priv->civ_731_mode = 1; }
+        if (freq_len == 1 && vfo == RIG_VFO_MEM)
+        {
+            *freq = 0;
+            rig_debug(RIG_DEBUG_ERR, "%s: Rig is in MEM mode and MEM channel is empty\n", __func__);
+            return -RIG_ETRUNC;
+        }
 
-        RETURNFUNC(-RIG_ERJCTED);
+        RETURNFUNC(-RIG_ENAVAIL);
     }
 
     if (freq_len != 3 && freq_len != 6 && freq_len != (priv->civ_731_mode ? 4 : 5))
diff --git a/rigs/icom/icr10.c b/rigs/icom/icr10.c
index 5eae14491..aaa180125 100644
--- a/rigs/icom/icr10.c
+++ b/rigs/icom/icr10.c
@@ -82,7 +82,6 @@ struct rig_caps icr10_caps =
     .level_gran =
     {
 #include "level_gran_icom.h"
-        [LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 255 } },
     },
     .parm_gran =  {},
     .ctcss_list =  NULL,
diff --git a/rigs/icom/icr20.c b/rigs/icom/icr20.c
index 91c9ac99a..0f755a906 100644
--- a/rigs/icom/icr20.c
+++ b/rigs/icom/icr20.c
@@ -82,7 +82,6 @@ struct rig_caps icr20_caps =
     .level_gran =
     {
 #include "level_gran_icom.h"
-        [LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 255 } },
     },
     .parm_gran =  {},
     .ctcss_list =  NULL,
diff --git a/rigs/icom/icr75.c b/rigs/icom/icr75.c
index f27ddb37c..d866eceb1 100644
--- a/rigs/icom/icr75.c
+++ b/rigs/icom/icr75.c
@@ -134,11 +134,9 @@ struct rig_caps icr75_caps =
     .level_gran =
     {
 #include "level_gran_icom.h"
-        [LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 255 } },
         [LVL_PBT_IN] = { .min = { .f = -1280 }, .max = { .f = +1280 }, .step = { .f = 15 } },
         [LVL_PBT_OUT] = { .min = { .f = -1280 }, .max = { .f = +1280 }, .step = { .f = 15 } },
         [LVL_CWPITCH] = { .min = { .i = 300 }, .max = { .i = 900 }, .step = { .i = 10 } },
-        [LVL_NR] = { .min = { .f = 0.0 }, .max = { .f = 1.0 }, .step = { .f = 0.066666667 } },
     },
     .parm_gran =  {
         [PARM_APO] = { .min = { .i = 1 }, .max = { .i = 1439} },
diff --git a/rigs/icom/icr8500.c b/rigs/icom/icr8500.c
index 8e0496b95..61cc33f2e 100644
--- a/rigs/icom/icr8500.c
+++ b/rigs/icom/icr8500.c
@@ -102,8 +102,6 @@ struct rig_caps icr8500_caps =
     .level_gran =
     {
 #include "level_gran_icom.h"
-        [LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 255 } },
-        [LVL_IF] = { .min = { .i = 0 }, .max = { .i = 255 }, .step = { .i = 1 } },
     },
     .parm_gran =  {},
     .ctcss_list =  NULL,    /* FIXME: CTCSS/DCS list */
diff --git a/rigs/icom/icr9000.c b/rigs/icom/icr9000.c
index f84239228..33e9f4887 100644
--- a/rigs/icom/icr9000.c
+++ b/rigs/icom/icr9000.c
@@ -94,7 +94,6 @@ struct rig_caps icr9000_caps =
     .level_gran =
     {
 #include "level_gran_icom.h"
-        [LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 255 } },
     },
     .parm_gran =  {
         [PARM_BANDSELECT] = {.step = {.s = "BANDUNUSED,BAND160M,BAND80M,BAND40M,BAND30M,BAND20M,BAND17M,BAND15M,BAND12M,BAND10M,BAND6M,BANDGEN"}},
diff --git a/rigs/icom/icr9500.c b/rigs/icom/icr9500.c
index 7e9532be1..e8bb4977b 100644
--- a/rigs/icom/icr9500.c
+++ b/rigs/icom/icr9500.c
@@ -108,7 +108,6 @@ struct rig_caps icr9500_caps =
     .level_gran =
     {
 #include "level_gran_icom.h"
-        [LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 255 } },
     },
     .parm_gran =  {
         [PARM_BACKLIGHT] = {.min = {.f = 0.0f}, .max = {.f = 1.0f}, .step = {.f = 1.0f / 255.0f}},
diff --git a/rigs/icom/icrx7.c b/rigs/icom/icrx7.c
index cd5981297..089c1d6b5 100644
--- a/rigs/icom/icrx7.c
+++ b/rigs/icom/icrx7.c
@@ -80,7 +80,6 @@ struct rig_caps icrx7_caps =
     .level_gran =
     {
 #include "level_gran_icom.h"
-        [LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 255 } },
     },
     .parm_gran =  {},
     .ctcss_list =  NULL,
diff --git a/rigs/icom/id1.c b/rigs/icom/id1.c
index d98ca405d..81004a411 100644
--- a/rigs/icom/id1.c
+++ b/rigs/icom/id1.c
@@ -98,7 +98,6 @@ struct rig_caps id1_caps =
     .level_gran =
     {
 #include "level_gran_icom.h"
-        [LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 255 } },
     },
     .parm_gran =  {},
     .ctcss_list =  common_ctcss_list,
diff --git a/rigs/icom/id5100.c b/rigs/icom/id5100.c
index 83f284acf..281e85725 100644
--- a/rigs/icom/id5100.c
+++ b/rigs/icom/id5100.c
@@ -553,7 +553,6 @@ struct rig_caps id5100_caps =
     .level_gran =
     {
 #include "level_gran_icom.h"
-        [LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 255 } },
     },
     .extparms = icom_ext_parms,
     .parm_gran =  {},
@@ -630,7 +629,6 @@ struct rig_caps id5100_caps =
     .get_mode =  id5100_get_mode,
     .set_vfo =  id5100_set_vfo,
     .set_split_vfo = id5100_set_split_vfo,
-    .set_split_freq = id5100_set_split_freq,
 
     .set_powerstat = icom_set_powerstat,
     //.get_powerstat = icom_get_powerstat, // ID-5100 cannot get power status
diff --git a/rigs/kenwood/flex6xxx.c b/rigs/kenwood/flex6xxx.c
index 274404978..57c42af89 100644
--- a/rigs/kenwood/flex6xxx.c
+++ b/rigs/kenwood/flex6xxx.c
@@ -1378,7 +1378,6 @@ struct rig_caps powersdr_caps =
 #include "level_gran_kenwood.h"
         [LVL_KEYSPD] = { .min = { .i = 5 }, .max = { .i = 60 }, .step = { .i = 1 } },
     },     /* FIXME: granularity */
-    .parm_gran =        {},
     .parm_gran =  {
         // there  are V00 thru V13 but we don't cover them as of yet -- what rig?
         [PARM_BANDSELECT] = {.min = {.f = 0.0f}, .max = {.f = 1.0f}, .step = {.s = "BAND160M,BAND80M,BAND60M,BAND40M,BAND30M,BAND20M,BAND17M,BAND15M,BAND12M,BAND10M,BAND6M,BAND2M,BANDWWV,BANDGEN"}}
diff --git a/rigs/kenwood/pihpsdr.c b/rigs/kenwood/pihpsdr.c
index d09391b16..d368a2b95 100644
--- a/rigs/kenwood/pihpsdr.c
+++ b/rigs/kenwood/pihpsdr.c
@@ -122,7 +122,6 @@ struct rig_caps pihpsdr_caps =
     .has_set_level =  RIG_LEVEL_SET(PIHPSDR_LEVEL_ALL),
     .has_get_parm =  RIG_PARM_NONE,
     .has_set_parm =  RIG_PARM_NONE,    /* FIXME: parms */
-    .level_gran =  {},                 /* FIXME: granularity */
     .parm_gran =  {},
     .vfo_ops =  PIHPSDR_VFO_OP,
     .scan_ops =  PIHPSDR_SCAN_OP,
diff --git a/rigs/kenwood/ts2000.c b/rigs/kenwood/ts2000.c
index 134d3bccb..bf98856dd 100644
--- a/rigs/kenwood/ts2000.c
+++ b/rigs/kenwood/ts2000.c
@@ -1703,7 +1703,6 @@ struct rig_caps ts2000_caps =
     .level_gran =
     {
 #include "level_gran_kenwood.h"
-        [LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 255 } },
         [LVL_VOXDELAY] = { .min = { .i = 0 }, .max = { .i = 30 }, .step = { .i = 1 } },
         [LVL_KEYSPD] = {.min = {.i = 10}, .max = {.i = 60}, .step = {.i = 1}},
         [LVL_CWPITCH] = {.min = {.i = 400}, .max = {.i = 1000}, .step = {.i = 50}},
diff --git a/rigs/kenwood/ts480.c b/rigs/kenwood/ts480.c
index b9208dc13..96a904805 100644
--- a/rigs/kenwood/ts480.c
+++ b/rigs/kenwood/ts480.c
@@ -1378,7 +1378,6 @@ struct rig_caps ts480_caps =
     .level_gran =
     {
 #include "level_gran_kenwood.h"
-        [LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 255 } },
         [LVL_VOXDELAY] = { .min = { .i = 0 }, .max = { .i = 30 }, .step = { .i = 1 } },
         [LVL_KEYSPD] = {.min = {.i = 10}, .max = {.i = 60}, .step = {.i = 1}},
         [LVL_CWPITCH] = {.min = {.i = 400}, .max = {.i = 1000}, .step = {.i = 50}},
@@ -1577,7 +1576,6 @@ struct rig_caps qrplabs_caps =
     .level_gran =
     {
 #include "level_gran_kenwood.h"
-        [LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 255 } },
         [LVL_VOXDELAY] = { .min = { .i = 0 }, .max = { .i = 30 }, .step = { .i = 1 } },
         [LVL_KEYSPD] = {.min = {.i = 10}, .max = {.i = 60}, .step = {.i = 1}},
         [LVL_CWPITCH] = {.min = {.i = 400}, .max = {.i = 1000}, .step = {.i = 50}},
@@ -1757,7 +1755,6 @@ struct rig_caps pt8000a_caps =
     .level_gran =
     {
 #include "level_gran_kenwood.h"
-        [LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 255 } },
         [LVL_VOXDELAY] = { .min = { .i = 0 }, .max = { .i = 30 }, .step = { .i = 1 } },
         [LVL_KEYSPD] = {.min = {.i = 10}, .max = {.i = 60}, .step = {.i = 1}},
         [LVL_CWPITCH] = {.min = {.i = 400}, .max = {.i = 1000}, .step = {.i = 50}},
@@ -1938,7 +1935,6 @@ struct rig_caps sdruno_caps =
     .vfo_ops = TS480_VFO_OPS,
     .level_gran = {
 #include "level_gran_kenwood.h"
-        [LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 255 } },
         [LVL_VOXDELAY] = { .min = { .i = 0 }, .max = { .i = 30 }, .step = { .i = 1 } },
         [LVL_KEYSPD] = {.min = {.i = 10}, .max = {.i = 60}, .step = {.i = 1}},
         [LVL_CWPITCH] = {.min = {.i = 400}, .max = {.i = 1000}, .step = {.i = 50}},
diff --git a/rigs/yaesu/ft950.c b/rigs/yaesu/ft950.c
index 4e7198663..c131892d0 100644
--- a/rigs/yaesu/ft950.c
+++ b/rigs/yaesu/ft950.c
@@ -108,7 +108,6 @@ struct rig_caps ft950_caps =
     .level_gran =
     {
 #include "level_gran_yaesu.h"
-        [LVL_RAWSTR] = { .min = { .i = 0 }, .max = { .i = 255 } },
         [LVL_CWPITCH] = { .min = { .i = 300 }, .max = { .i = 1050 }, .step = { .i = 50 } },
         [LVL_KEYSPD] = { .min = { .i = 4 }, .max = { .i = 60 }, .step = { .i = 1 } },
         [LVL_NOTCHF] = { .min = { .i = 1 }, .max = { .i = 3000 }, .step = { .i = 10 } },
diff --git a/rotators/grbltrk/grbltrk.c b/rotators/grbltrk/grbltrk.c
index 100ca0728..0c81a54fe 100644
--- a/rotators/grbltrk/grbltrk.c
+++ b/rotators/grbltrk/grbltrk.c
@@ -376,7 +376,7 @@ grbltrk_rot_get_position(ROT *rot, azimuth_t *az, elevation_t *el)
 
         /* grbl 1.3a esp32 */
         //<Idle|MPos:0.000,0.000,0.000|FS:0,0|Pn:P|WCO:5.000,0.000,0.000>
-        sscanf(rsp, "%[^'|']|MPos:%f,%f,%256s", dummy0, &mpos[0], &mpos[1], dummy1);
+        sscanf(rsp, "%[^'|']|MPos:%f,%f,%255s", dummy0, &mpos[0], &mpos[1], dummy1);
 
         //rot_debug(RIG_DEBUG_ERR, "%s: (%.3f, %.3f) (%.3f, %.3f)\n", __func__, mpos[0], mpos[1], wpos[0], wpos[1]);
 
diff --git a/src/misc.c b/src/misc.c
index 95ae02cd5..dda492baf 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -2932,7 +2932,7 @@ hamlib_band_t rig_get_band(RIG *rig, freq_t freq, int band)
             n++;
         }
 
-        return RIG_BANDSELECT_UNUSED;
+        return RIG_BAND_UNUSED;
     }
     for (i = 0 ; rig_bandselect_str[i].str[0] != '\0'; i++)
     {
@@ -2942,7 +2942,7 @@ hamlib_band_t rig_get_band(RIG *rig, freq_t freq, int band)
         }
     }
 
-    return RIG_BANDSELECT_GEN;
+    return RIG_BAND_UNUSED;
 }
 
 // Gets the rig's band index from the hamlib_band_t