diff --git a/rigs/icom/icom.c b/rigs/icom/icom.c
index 849b56778..ef63f85f0 100644
--- a/rigs/icom/icom.c
+++ b/rigs/icom/icom.c
@@ -1041,7 +1041,7 @@ int icom_get_freq(RIG *rig, vfo_t vfo, freq_t *freq)
 
             if (retval == RIG_OK) // then we're done!!
             {
-                *freq = from_bcd(ackbuf[2], (priv->civ_731_mode ? 4 : 5) * 2);
+                *freq = from_bcd(&ackbuf[2], (priv->civ_731_mode ? 4 : 5) * 2);
                 return retval;
             }
 
@@ -3647,7 +3647,7 @@ int icom_set_split_freq(RIG *rig, vfo_t vfo, freq_t tx_freq)
     rs = &rig->state;
     priv = (struct icom_priv_data *) rs->priv;
 
-    if (priv->curr_vfo == RIG_VFO_NONE && vfo == RIG_VFO_CURR)
+    if (priv->curr_vfo == RIG_VFO_NONE)
     {
         icom_set_default_vfo(rig);
     }
@@ -3862,7 +3862,7 @@ int icom_get_split_freq(RIG *rig, vfo_t vfo, freq_t *tx_freq)
 
                 if (retval == RIG_OK) // then we're done!!
                 {
-                    *tx_freq = from_bcd(ackbuf[2], (priv->civ_731_mode ? 4 : 5) * 2);
+                    *tx_freq = from_bcd(&ackbuf[2], (priv->civ_731_mode ? 4 : 5) * 2);
                     return retval;
                 }