diff --git a/kenwood/kenwood.c b/kenwood/kenwood.c
index f9ee2a435..7bf9794fb 100644
--- a/kenwood/kenwood.c
+++ b/kenwood/kenwood.c
@@ -2718,7 +2718,7 @@ int kenwood_set_ctcss_tone(RIG *rig, vfo_t vfo, tone_t tone)
 int kenwood_set_ctcss_tone_tn(RIG *rig, vfo_t vfo, tone_t tone)
 {
     const struct rig_caps *caps = rig->caps;
-    char buf[6];
+    char buf[16];
     int i;
 
     rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
@@ -2861,7 +2861,7 @@ int kenwood_get_ctcss_tone(RIG *rig, vfo_t vfo, tone_t *tone)
 int kenwood_set_ctcss_sql(RIG *rig, vfo_t vfo, tone_t tone)
 {
     const struct rig_caps *caps = rig->caps;
-    char buf[6];
+    char buf[16];
     int i;
 
     rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
diff --git a/kenwood/th.c b/kenwood/th.c
index 5a328f5fd..6bafeb541 100644
--- a/kenwood/th.c
+++ b/kenwood/th.c
@@ -2245,7 +2245,7 @@ static int find_tone_index(const tone_t *tone_list, tone_t tone)
 /* --------------------------------------------------------------------- */
 int th_set_channel(RIG *rig, const channel_t *chan)
 {
-    char membuf[150];
+    char membuf[256];
     int retval;
     char req[64];
     char lockoutstr[8];
@@ -2453,7 +2453,7 @@ int th_set_channel(RIG *rig, const channel_t *chan)
 
         /* Step can be hexa */
         retval = snprintf(membuf, sizeof(membuf),
-                          "%s,%011"PRIll",%X,%d,%d,%d,%d,%d,%02d,%02d,%03d,%09"PRIll",%d%s",
+                          "%8s,%011"PRIll",%X,%d,%d,%d,%d,%d,%02d,%02d,%03d,%09"PRIll",%d%10s",
                           req, (int64_t)chan->freq, step, shift, rev, tone,
                           ctcss, dcs, tonefq, ctcssfq, dcscode,
                           (int64_t)labs((long)(chan->rptr_offs)), mode, lockoutstr