diff --git a/rigs/icom/icom.c b/rigs/icom/icom.c
index 828731d2e..38e12e82b 100644
--- a/rigs/icom/icom.c
+++ b/rigs/icom/icom.c
@@ -6030,10 +6030,10 @@ int icom_get_split_freq(RIG *rig, vfo_t vfo, freq_t *tx_freq)
         if (ptt)
         {
             int cache_ms_freq;
-            rig_get_cache_freq(rig, vfo, tx_freq, &cache_ms_freq);
+            retval = rig_get_cache_freq(rig, vfo, tx_freq, &cache_ms_freq);
             rig_debug(RIG_DEBUG_TRACE, "%s: ptt is on so returning last known freq\n",
                       __func__);
-            RETURNFUNC2(RIG_OK);
+            RETURNFUNC2(retval);
         }
     }
 
diff --git a/rigs/kenwood/kenwood.c b/rigs/kenwood/kenwood.c
index 45bd5012f..1596c2dfe 100644
--- a/rigs/kenwood/kenwood.c
+++ b/rigs/kenwood/kenwood.c
@@ -666,19 +666,13 @@ transaction_read:
              * the decoder for callback. That way we don't ignore any
              * commands.
              */
-            // if we got FA or FB unexpectedly then perhaps RIG_TRN is enabled and we just need to handle it
-            if (strncmp(buffer, "FA", 2) == 0)
+            // If we got FA or FB unexpectedly then perhaps RIG_TRN is enabled
+            //    and we just need to handle it
+            if (buffer[0] == 'F' && (buffer[1] == 'A' || buffer[1] == 'B'))
             {
                 freq_t freq;
-                sscanf(buffer, "FA%lg", &freq);
-                rig_set_cache_freq(rig, RIG_VFO_A, freq);
-                goto transaction_read;
-            }
-            else if (strncmp(buffer, "FB", 2) == 0)
-            {
-                freq_t freq;
-                sscanf(buffer, "FB%lg", &freq);
-                rig_set_cache_freq(rig, RIG_VFO_B, freq);
+                sscanf(buffer + 2, "%lg", &freq);
+                rig_set_cache_freq(rig, buffer[1] == 'A' ? RIG_VFO_A : RIG_VFO_B, freq);
                 goto transaction_read;
             }