diff --git a/src/rig.c b/src/rig.c
index 0f750690c..d85dceb5b 100644
--- a/src/rig.c
+++ b/src/rig.c
@@ -3131,7 +3131,7 @@ int HAMLIB_API rig_get_ptt(RIG *rig, vfo_t vfo, ptt_t *ptt)
     const struct rig_caps *caps;
     struct rig_state *rs = &rig->state;
     int retcode = RIG_OK;
-    int rc2, status;
+    int status;
     vfo_t curr_vfo;
     int cache_ms;
     int targetable_ptt = 0;
@@ -3226,7 +3226,7 @@ int HAMLIB_API rig_get_ptt(RIG *rig, vfo_t vfo, ptt_t *ptt)
         /* try and revert even if we had an error above */
         if (!targetable_ptt)
         {
-            rc2 = caps->set_vfo(rig, curr_vfo);
+            int rc2 = caps->set_vfo(rig, curr_vfo);
 
             if (RIG_OK == retcode)
             {
@@ -6485,13 +6485,12 @@ const char *HAMLIB_API rig_get_info(RIG *rig)
 static void make_crc_table(unsigned long crcTable[])
 {
     unsigned long POLYNOMIAL = 0xEDB88320;
-    unsigned long remainder;
     unsigned char b = 0;
 
     do
     {
         // Start with the data byte
-        remainder = b;
+        unsigned long remainder = b;
 
         unsigned long bit;