diff --git a/lib/win32termios.h b/lib/win32termios.h
index a6279bef0..f4d6f04e6 100644
--- a/lib/win32termios.h
+++ b/lib/win32termios.h
@@ -56,8 +56,8 @@
 }
 
 typedef unsigned char   cc_t;
-typedef unsigned int    speed_t;
-typedef unsigned int    tcflag_t;
+typedef unsigned int32_t    speed_t;
+typedef unsigned int32_t    tcflag_t;
 
 /* structs are from linux includes or linux man pages to match
    interfaces.
diff --git a/rigs/kenwood/flex6xxx.c b/rigs/kenwood/flex6xxx.c
index fd7cd74d1..732677246 100644
--- a/rigs/kenwood/flex6xxx.c
+++ b/rigs/kenwood/flex6xxx.c
@@ -79,7 +79,7 @@ static rmode_t powersdr_mode_table[KENWOOD_MODE_TABLE_MAX] =
     [6] = RIG_MODE_AM,
     [7] = RIG_MODE_PKTUSB,
     [8] = RIG_MODE_NONE, // SPEC -- not implemented
-    [8] = RIG_MODE_PKTLSB,
+    [9] = RIG_MODE_PKTLSB,
     [10] = RIG_MODE_SAM,
     [11] = RIG_MODE_NONE // DRM -- not implemented
 };
@@ -1140,7 +1140,7 @@ const struct rig_caps powersdr_caps =
     RIG_MODEL(RIG_MODEL_POWERSDR),
     .model_name =       "PowerSDR/Thetis",
     .mfg_name =     "FlexRadio/ANAN",
-    .version =      "20201003.0",
+    .version =      "20201016.0",
     .copyright =        "LGPL",
     .status =       RIG_STATUS_STABLE,
     .rig_type =     RIG_TYPE_TRANSCEIVER,
diff --git a/rigs/yaesu/newcat.c b/rigs/yaesu/newcat.c
index 25600dc57..ce27b4811 100644
--- a/rigs/yaesu/newcat.c
+++ b/rigs/yaesu/newcat.c
@@ -6216,7 +6216,7 @@ int newcat_get_rx_bandwidth(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t *width)
             switch (w)
             {
             case 0:
-                if (mode == RIG_MODE_CW || RIG_MODE_CWR) { *width = narrow ? 500 : 2400; }
+                if (mode == RIG_MODE_CW || mode == RIG_MODE_CWR) { *width = narrow ? 500 : 2400; }
                 else { *width = narrow ? 300 : 500; }
 
                 break;
diff --git a/rigs/yaesu/newcat.h b/rigs/yaesu/newcat.h
index 0b69b8057..ce7ff95b1 100644
--- a/rigs/yaesu/newcat.h
+++ b/rigs/yaesu/newcat.h
@@ -50,7 +50,7 @@
 typedef char ncboolean;
 
 /* shared function version */
-#define NEWCAT_VER "20201015"
+#define NEWCAT_VER "20201016"
 
 /* Hopefully large enough for future use, 128 chars plus '\0' */
 #define NEWCAT_DATA_LEN                 129