diff --git a/kenwood/thd74.c b/kenwood/thd74.c
index 4a9b06791..7d12ec48a 100644
--- a/kenwood/thd74.c
+++ b/kenwood/thd74.c
@@ -885,7 +885,7 @@ static int thd74_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
     char c, lvlc, cmd[11];
 
     rig_debug(RIG_DEBUG_TRACE, "%s: called\n", __func__);
-    rig_debug(RIG_DEBUG_TRACE, "%s: level: %ld\n", __func__, level);
+    rig_debug(RIG_DEBUG_TRACE, "%s: level: %s\n", __func__, rig_level(level));
     rig_debug(RIG_DEBUG_TRACE, "%s: value.i: %d\n", __func__, val.i);
     rig_debug(RIG_DEBUG_TRACE, "%s: value.f: %lf\n", __func__, val.f);
 
diff --git a/kit/elektor507.c b/kit/elektor507.c
index 526aef410..7622d5c01 100644
--- a/kit/elektor507.c
+++ b/kit/elektor507.c
@@ -296,7 +296,7 @@ int elektor507_ftdi_write_data(RIG *rig, void *FTOutBuf,
     FT_Result ret;
     int Result;
 
-    rig_debug(RIG_DEBUG_TRACE, "%s called, %d bytes\n", __func__, BufferSize);
+    rig_debug(RIG_DEBUG_TRACE, "%s called, %d bytes\n", __func__, (int)BufferSize);
 
     /* Open FTDI */
     ret = extra_priv->FT_Open(0, &extra_priv->ftHandle);
diff --git a/pcr/pcr.c b/pcr/pcr.c
index 074bd0efe..ea87c429d 100644
--- a/pcr/pcr.c
+++ b/pcr/pcr.c
@@ -1113,13 +1113,13 @@ pcr_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
 
     if (RIG_LEVEL_IS_FLOAT(level))
     {
-        rig_debug(RIG_DEBUG_VERBOSE, "%s: level = %lu, val = %f\n",
-                  __func__, level, val.f);
+        rig_debug(RIG_DEBUG_VERBOSE, "%s: level = %s, val = %f\n",
+                  __func__, rig_strlevel(level), val.f);
     }
     else
     {
-        rig_debug(RIG_DEBUG_VERBOSE, "%s: level = %lu, val = %ul\n",
-                  __func__, level, val.i);
+        rig_debug(RIG_DEBUG_VERBOSE, "%s: level = %s, val = %ul\n",
+                  __func__, rig_strlevel(level), val.i);
     }
 
     switch (level)
diff --git a/yaesu/ft1000d.c b/yaesu/ft1000d.c
index e200bef17..c07a05ff1 100644
--- a/yaesu/ft1000d.c
+++ b/yaesu/ft1000d.c
@@ -2363,8 +2363,8 @@ int ft1000d_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *value)
         return -RIG_EINVAL;
     }
 
-    rig_debug(RIG_DEBUG_TRACE, "%s: passed vfo 0x%02x\n", __func__, vfo);
-    rig_debug(RIG_DEBUG_TRACE, "%s: passed level %li\n", __func__, level);
+    rig_debug(RIG_DEBUG_TRACE, "%s: passed vfo %s\n", __func__, rig_strvfo(vfo));
+    rig_debug(RIG_DEBUG_TRACE, "%s: passed level %s\n", __func__, rig_strlevel(level));
 
     priv = (struct ft1000d_priv_data *) rig->state.priv;
 
diff --git a/yaesu/ft600.c b/yaesu/ft600.c
index f65cfc3f0..41eda2690 100644
--- a/yaesu/ft600.c
+++ b/yaesu/ft600.c
@@ -370,7 +370,7 @@ int ft600_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
         return ret;
     }
 
-    rig_debug(RIG_DEBUG_VERBOSE, "S_METER: %hhx ", priv->s_meter);
+    rig_debug(RIG_DEBUG_VERBOSE, "S_METER: %u ", priv->s_meter);
 
     //val->i = FT600_DUMMY_S_METER_VALUE; //DUMMY
     val->i = priv->s_meter;
diff --git a/yaesu/ft890.c b/yaesu/ft890.c
index 9511fb99c..1aaf20dfe 100644
--- a/yaesu/ft890.c
+++ b/yaesu/ft890.c
@@ -1906,8 +1906,8 @@ static int ft890_send_rit_freq(RIG *rig, unsigned char ci, shortfreq_t rit)
     to_bcd(priv->p_cmd, rit / 10, FT890_BCD_RIT);
 
     rig_debug(RIG_DEBUG_TRACE,
-              "%s: requested rit after conversion = %li Hz\n",
-              __func__, (int64_t)from_bcd(priv->p_cmd, FT890_BCD_RIT) * 10);
+              "%s: requested rit after conversion = %d Hz\n",
+              __func__, (int)from_bcd(priv->p_cmd, FT890_BCD_RIT) * 10);
 
     priv->p_cmd[P1] = p1;         /* ick */
     priv->p_cmd[P2] = p2;
diff --git a/yaesu/ft920.c b/yaesu/ft920.c
index 11c3e416e..bf7da5927 100644
--- a/yaesu/ft920.c
+++ b/yaesu/ft920.c
@@ -2638,8 +2638,8 @@ static int ft920_send_rit_freq(RIG *rig, unsigned char ci, shortfreq_t rit)
     /* store bcd format in in p_cmd */
     to_bcd(priv->p_cmd, rit / 10, FT920_BCD_RIT);
 
-    rig_debug(RIG_DEBUG_TRACE, "%s: requested rit after conversion = %li Hz\n",
-              __func__, (int64_t)from_bcd(priv->p_cmd, FT920_BCD_RIT) * 10);
+    rig_debug(RIG_DEBUG_TRACE, "%s: requested rit after conversion = %d Hz\n",
+              __func__, (int)from_bcd(priv->p_cmd, FT920_BCD_RIT) * 10);
 
     priv->p_cmd[P1] = p1;               /* ick */
     priv->p_cmd[P2] = p2;
diff --git a/yaesu/ft990.c b/yaesu/ft990.c
index 1217d6387..fc99cabd1 100644
--- a/yaesu/ft990.c
+++ b/yaesu/ft990.c
@@ -2312,8 +2312,8 @@ int ft990_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *value)
         return -RIG_EINVAL;
     }
 
-    rig_debug(RIG_DEBUG_TRACE, "%s: passed vfo 0x%02x\n", __func__, vfo);
-    rig_debug(RIG_DEBUG_TRACE, "%s: passed level %li\n", __func__, level);
+    rig_debug(RIG_DEBUG_TRACE, "%s: passed vfo %s\n", __func__, rig_strvfo(vfo));
+    rig_debug(RIG_DEBUG_TRACE, "%s: passed level %s\n", __func__, rig_strlevel(level));
 
     priv = (struct ft990_priv_data *) rig->state.priv;