diff --git a/elad/elad.c b/elad/elad.c
index 968eb8080..f488d1d5a 100644
--- a/elad/elad.c
+++ b/elad/elad.c
@@ -511,12 +511,12 @@ rmode_t elad2rmode(unsigned char mode, const rmode_t mode_table[])
 
 char rmode2elad(rmode_t mode, const rmode_t mode_table[])
 {
-    int i;
-
     rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
 
     if (mode != RIG_MODE_NONE)
     {
+        int i;
+
         for (i = 0; i < ELAD_MODE_TABLE_MAX; i++)
         {
             if (mode_table[i] == mode)
@@ -1720,7 +1720,7 @@ int elad_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
         }
 
         snprintf(buf, sizeof(buf), "OM0%c", c);  /* target vfo is ignored */
-        int err = elad_transaction(rig, buf, NULL, 0);
+        err = elad_transaction(rig, buf, NULL, 0);
 
         if (vfo != RIG_VFO_CURR && vfo != curr_vfo)
         {
@@ -1990,7 +1990,7 @@ int elad_get_mode_if(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
             || rig->caps->rig_model == RIG_MODEL_TS950SDX)
     {
 
-        err = elad_get_filter(rig, width);
+        elad_get_filter(rig, width);
         /* non fatal */
     }
 
@@ -2630,7 +2630,7 @@ int elad_set_ctcss_tone(RIG *rig, vfo_t vfo, tone_t tone)
     caps = rig->caps;
 
     /* TODO: replace 200 by something like RIGTONEMAX */
-    for (i = 0; caps->ctcss_list[i] != 0 && i < 200; i++)
+    for (i = 0; caps->ctcss_list[i] != 0; i++)
     {
         if (caps->ctcss_list[i] == tone)
         {
@@ -2663,7 +2663,7 @@ int elad_set_ctcss_tone_tn(RIG *rig, vfo_t vfo, tone_t tone)
     int i;
 
     /* XXX 40 is a fixed constant */
-    for (i = 0; caps->ctcss_list[i] != 0 && i < 40; i++)
+    for (i = 0; caps->ctcss_list[i] != 0; i++)
     {
         if (tone == caps->ctcss_list[i])
         {
@@ -2815,7 +2815,7 @@ int elad_set_ctcss_sql(RIG *rig, vfo_t vfo, tone_t tone)
     char buf[6];
     int i;
 
-    for (i = 0; caps->ctcss_list[i] != 0 && i < 40; i++)
+    for (i = 0; caps->ctcss_list[i] != 0; i++)
     {
         if (tone == caps->ctcss_list[i])
         {
@@ -3378,7 +3378,7 @@ int elad_send_morse(RIG *rig, vfo_t vfo, const char *msg)
     }
 
     char morsebuf[40], m2[30];
-    int msg_len, buff_len, retval, i;
+    int msg_len, retval, i;
     const char *p;
 
     p = msg;
@@ -3410,7 +3410,7 @@ int elad_send_morse(RIG *rig, vfo_t vfo, const char *msg)
             else { return -RIG_EINVAL; }
         }
 
-        buff_len = msg_len > 24 ? 24 : msg_len;
+        int buff_len = msg_len > 24 ? 24 : msg_len;
 
         strncpy(m2, p, 24);
         m2[24] = '\0';