diff --git a/rigs/aor/aor.c b/rigs/aor/aor.c
index c9f7b4079..b13002902 100644
--- a/rigs/aor/aor.c
+++ b/rigs/aor/aor.c
@@ -439,7 +439,7 @@ int format8k_mode(RIG *rig, char *buf, rmode_t mode, pbwidth_t width)
 int aor_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
 {
     struct aor_priv_caps *priv = (struct aor_priv_caps *)rig->caps->priv;
-    char mdbuf[8];
+    char mdbuf[9];
     char mdbuf2[16] = "";
     int mdbuf2_len, retval;
 
diff --git a/rigs/tentec/rx340.c b/rigs/tentec/rx340.c
index 1938643be..cb3b1daf2 100644
--- a/rigs/tentec/rx340.c
+++ b/rigs/tentec/rx340.c
@@ -580,7 +580,7 @@ int rx340_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
 const char *rx340_get_info(RIG *rig)
 {
     static char buf[BUFSZ]; /* FIXME: reentrancy */
-    int firmware_len, retval;
+    int firmware_len=0, retval;
 
 #define REPORT_FIRM "V"EOM
     retval = rx340_transaction(rig, REPORT_FIRM, strlen(REPORT_FIRM), buf,