diff --git a/src/neverused.c b/src/neverused.c
index 633aa5fcb..891e52bc9 100644
--- a/src/neverused.c
+++ b/src/neverused.c
@@ -109,6 +109,7 @@ void never_used()
     icom_power2mW();
     icom_send_morse();
     icom_send_voice_mem();
+    icom_stop_morse();
     icom_set_bank();
     icom_set_ctcss_sql();
     icom_set_ctcss_tone();
diff --git a/src/rig.c b/src/rig.c
index d2c8f9bbb..ffeb0b4b0 100644
--- a/src/rig.c
+++ b/src/rig.c
@@ -5179,7 +5179,6 @@ static int wait_morse_ptt(RIG *rig, vfo_t vfo)
 {
     ptt_t pttStatus = RIG_PTT_OFF;
     int loops = 0;
-    int retval;
 
     rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
 
@@ -5187,6 +5186,7 @@ static int wait_morse_ptt(RIG *rig, vfo_t vfo)
 
     do
     {
+        int retval;
         rig_debug(RIG_DEBUG_TRACE, "%s: loop#%d until ptt=0, ptt=%d\n", __func__, loops,
                   pttStatus);
         elapsed_ms(&rig->state.cache.time_ptt, HAMLIB_ELAPSED_INVALIDATE);