diff --git a/rigs/kenwood/elecraft.c b/rigs/kenwood/elecraft.c
index c25d53f4d..17c339df9 100644
--- a/rigs/kenwood/elecraft.c
+++ b/rigs/kenwood/elecraft.c
@@ -283,6 +283,14 @@ int elecraft_open(RIG *rig)
                                                                                         it's not supported */
     }
 
+    // For rigs like K3X vfo emulation need to set VFO_A to start
+    vfo_t vfo;
+    rig_get_vfo(rig, &vfo);
+    if (vfo != RIG_VFO_A && vfo != RIG_VFO_B)
+    {
+        rig_set_vfo(rig, RIG_VFO_A);
+    }
+
     return RIG_OK;
 }
 
diff --git a/rigs/kenwood/th.c b/rigs/kenwood/th.c
index 33a68a281..7fd89979b 100644
--- a/rigs/kenwood/th.c
+++ b/rigs/kenwood/th.c
@@ -309,7 +309,7 @@ th_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
 
         kmode = rmode2kenwood(mode, priv->mode_table);
 
-        if (kmode == -1)
+        if (kmode < 0)
         {
             rig_debug(RIG_DEBUG_WARN, "%s: Unsupported Mode value '%s'\n",
                       __func__, rig_strrmode(mode));
diff --git a/rigs/kenwood/thd74.c b/rigs/kenwood/thd74.c
index e35c1e7a0..86333c1e2 100644
--- a/rigs/kenwood/thd74.c
+++ b/rigs/kenwood/thd74.c
@@ -470,7 +470,7 @@ int thd74_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
     {
         kmode = rmode2kenwood(mode, priv->mode_table);
 
-        if (kmode == -1)
+        if (kmode < 0)
         {
             rig_debug(RIG_DEBUG_WARN, "%s: Unsupported Mode value '%s'\n",
                       __func__, rig_strrmode(mode));
diff --git a/src/microham.c b/src/microham.c
index 49cc6ba9b..081cb9bc1 100644
--- a/src/microham.c
+++ b/src/microham.c
@@ -776,6 +776,8 @@ static void *read_device(void *p)
             return NULL;
         }
 
+
+#if defined(HAVE_PTHREAD) && defined(HAVE_SOCKETPAIR) && defined(HAVE_SELECT)
         //
         // This is the right place to ensure that a heartbeat is sent
         // to the microham device regularly (15 sec delay is the maximum
@@ -785,6 +787,7 @@ static void *read_device(void *p)
         {
             heartbeat();
         }
+#endif
 
         //
         // Wait for something to arrive, either from the microham device