diff --git a/rigs/adat/adat.c b/rigs/adat/adat.c
index b7d14eb1b..a7aa8c00a 100644
--- a/rigs/adat/adat.c
+++ b/rigs/adat/adat.c
@@ -2165,6 +2165,7 @@ int adat_cmd_fn_set_freq(RIG *pRig)
     }
     else
     {
+        // cppcheck-suppress constVariablePointer
         const adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv;
         char acBuf[ ADAT_BUFSZ + 1 ];
 
@@ -2220,6 +2221,7 @@ int adat_cmd_fn_set_vfo(RIG *pRig)
     }
     else
     {
+        // cppcheck-suppress constVariablePointer
         const adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv;
         char acBuf[ ADAT_BUFSZ + 1 ];
 
@@ -2683,6 +2685,7 @@ const char *adat_get_info(RIG *pRig)
 
         if (nRC == RIG_OK)
         {
+        // cppcheck-suppress constVariablePointer
             const adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv;
 
             snprintf(acBuf,2048,
@@ -2766,6 +2769,7 @@ int adat_get_freq(RIG *pRig, vfo_t vfo, freq_t *freq)
     }
     else
     {
+        // cppcheck-suppress constVariablePointer
         const adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv;
 
         nRC = adat_transaction(pRig, &adat_cmd_list_get_freq);
@@ -2923,6 +2927,7 @@ int adat_get_mode(RIG *pRig, vfo_t vfo, rmode_t *mode, pbwidth_t *width)
     }
     else
     {
+        // cppcheck-suppress constVariablePointer
         const adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv;
 
         nRC =  adat_transaction(pRig, &adat_cmd_list_get_mode);
@@ -2965,6 +2970,7 @@ int adat_get_vfo(RIG *pRig, vfo_t *vfo)
     }
     else
     {
+        // cppcheck-suppress constVariablePointer
         const adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv;
 
         nRC = adat_transaction(pRig, &adat_cmd_list_get_vfo);
@@ -3044,6 +3050,7 @@ int adat_get_ptt(RIG *pRig, vfo_t vfo, ptt_t *ptt)
     }
     else
     {
+        // cppcheck-suppress constVariablePointer
         const adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv;
 
         nRC = adat_transaction(pRig, &adat_cmd_list_get_ptt);
@@ -3303,6 +3310,7 @@ int adat_get_conf(RIG *pRig, token_t token, char *val)
     }
     else
     {
+        // cppcheck-suppress constVariablePointer
         const adat_priv_data_ptr pPriv = (adat_priv_data_ptr) pRig->state.priv;
 
         switch (token)
diff --git a/rigs/anytone/anytone.c b/rigs/anytone/anytone.c
index f0ce10fb0..8d0ca06fd 100644
--- a/rigs/anytone/anytone.c
+++ b/rigs/anytone/anytone.c
@@ -236,18 +236,16 @@ int anytone_cleanup(RIG *rig)
 {
     int retval = RIG_OK;
 
-    ENTERFUNC;
-
     if (rig == NULL)
     {
-        RETURNFUNC(-RIG_EARG);
-    }
-    else
-    {
-        free(rig->state.priv);
-        rig->state.priv = NULL;
+        return -RIG_EARG;
     }
 
+    ENTERFUNC;
+
+    free(rig->state.priv);
+    rig->state.priv = NULL;
+
     RETURNFUNC(retval);
 }
 
diff --git a/rigs/aor/ar7030p.c b/rigs/aor/ar7030p.c
index a354b587f..eca4dac42 100644
--- a/rigs/aor/ar7030p.c
+++ b/rigs/aor/ar7030p.c
@@ -1265,6 +1265,7 @@ static int ar7030p_set_vfo(RIG *rig, vfo_t vfo)
 static int ar7030p_get_vfo(RIG *rig, vfo_t *vfo)
 {
     int rc = RIG_OK;
+        // cppcheck-suppress constVariablePointer
     struct ar7030p_priv_data *priv = (struct ar7030p_priv_data *) rig->state.priv;
 
     assert(NULL != vfo);
@@ -1350,6 +1351,7 @@ static int ar7030p_get_mem(RIG *rig, vfo_t vfo, int *ch)
 {
     int rc = RIG_OK;
 
+        // cppcheck-suppress constVariablePointer
     struct ar7030p_priv_data *priv = (struct ar7030p_priv_data *) rig->state.priv;
     const channel_t *curr = priv->curr;