diff --git a/rigs/kenwood/elecraft.c b/rigs/kenwood/elecraft.c
index e349882cb..05b32835f 100644
--- a/rigs/kenwood/elecraft.c
+++ b/rigs/kenwood/elecraft.c
@@ -457,12 +457,12 @@ int verify_kenwood_id(RIG *rig, char *id)
 
     if (strcmp("017", idptr) != 0)
     {
-        rig_debug(RIG_DEBUG_VERBOSE, "%s: Rig (%s) is not a K2 or K3\n", __func__, id);
+        rig_debug(RIG_DEBUG_VERBOSE, "%s: Rig (%.4095s) is not a K2 or K3\n", __func__, id);
 //        return -RIG_EPROTO;
     }
     else
     {
-        rig_debug(RIG_DEBUG_VERBOSE, "%s: Rig ID is %s\n", __func__, id);
+        rig_debug(RIG_DEBUG_VERBOSE, "%s: Rig ID is %.4095s\n", __func__, id);
     }
 
     return RIG_OK;
diff --git a/rigs/kenwood/kenwood.c b/rigs/kenwood/kenwood.c
index 41e21f89d..4ff44d1cb 100644
--- a/rigs/kenwood/kenwood.c
+++ b/rigs/kenwood/kenwood.c
@@ -270,7 +270,7 @@ int kenwood_transaction(RIG *rig, const char *cmdstr, char *data,
     if (datasize > 0 && datasize < (cmdstr ? strlen(cmdstr) : 0))
     {
         rig_debug(RIG_DEBUG_WARN,
-                  "%s called cmd=%s datasize=%d, datasize < cmd length?\n", __func__,
+                  "%s called cmd=%.4095s datasize=%d, datasize < cmd length?\n", __func__,
                   cmdstr ? cmdstr : "(NULL)",
                   (int)datasize);
     }
diff --git a/rigs/winradio/g313-posix.c b/rigs/winradio/g313-posix.c
index 4ee963d7d..1fb7ac798 100644
--- a/rigs/winradio/g313-posix.c
+++ b/rigs/winradio/g313-posix.c
@@ -553,7 +553,7 @@ int g313_set_conf(RIG *rig, hamlib_token_t token, const char *val)
     case TOK_SHM_AUDIO:
         if (len > (FIFO_PATHNAME_SIZE - 1))
         {
-            rig_debug(RIG_DEBUG_WARN, "%s: set audio_path %s is too long\n", __func__, val);
+            rig_debug(RIG_DEBUG_WARN, "%s: set audio_path %.4095s is too long\n", __func__, val);
             return -RIG_EINVAL;
         }
 
@@ -566,7 +566,7 @@ int g313_set_conf(RIG *rig, hamlib_token_t token, const char *val)
     case TOK_SHM_IF:
         if (len > (FIFO_PATHNAME_SIZE - 1))
         {
-            rig_debug(RIG_DEBUG_WARN, "%s: set if_path %s is too long\n", __func__, val);
+            rig_debug(RIG_DEBUG_WARN, "%s: set if_path %.4095s is too long\n", __func__, val);
             return -RIG_EINVAL;
         }
 
@@ -579,7 +579,7 @@ int g313_set_conf(RIG *rig, hamlib_token_t token, const char *val)
     case TOK_SHM_SPECTRUM:
         if (len > (FIFO_PATHNAME_SIZE - 1))
         {
-            rig_debug(RIG_DEBUG_WARN, "%s: set spectrum_path %s is too long\n", __func__,
+            rig_debug(RIG_DEBUG_WARN, "%s: set spectrum_path %.4095s is too long\n", __func__,
                       val);
             return -RIG_EINVAL;
         }