diff --git a/src/main/fc/fc_msp.c b/src/main/fc/fc_msp.c
index fde7a3c07..0d72aee77 100755
--- a/src/main/fc/fc_msp.c
+++ b/src/main/fc/fc_msp.c
@@ -1035,7 +1035,11 @@ static bool mspFcProcessOutCommand(uint8_t cmdMSP, sbuf_t *dst, mspPostProcessFn
 #ifdef OSD
         sbufWriteU8(dst, 1); // OSD supported
         // send video system (AUTO/PAL/NTSC)
+#ifdef USE_MAX7456
         sbufWriteU8(dst, masterConfig.vcdProfile.video_system);
+#else
+        sbufWriteU8(dst, 0);
+#endif
         sbufWriteU8(dst, masterConfig.osdProfile.units);
         sbufWriteU8(dst, masterConfig.osdProfile.rssi_alarm);
         sbufWriteU16(dst, masterConfig.osdProfile.cap_alarm);
@@ -1197,9 +1201,6 @@ static mspResult_e mspFcProcessInCommand(uint8_t cmdMSP, sbuf_t *src)
 #ifdef GPS
     uint8_t wp_no;
     int32_t lat = 0, lon = 0, alt = 0;
-#endif
-#ifdef OSD
-    uint8_t addr, font_data[64];
 #endif
     switch (cmdMSP) {
     case MSP_SELECT_SETTING:
@@ -1532,29 +1533,43 @@ static mspResult_e mspFcProcessInCommand(uint8_t cmdMSP, sbuf_t *src)
 
 #ifdef OSD
     case MSP_SET_OSD_CONFIG:
-        addr = sbufReadU8(src);
-        // set all the other settings
-        if ((int8_t)addr == -1) {
-            masterConfig.vcdProfile.video_system = sbufReadU8(src);
-            masterConfig.osdProfile.units = sbufReadU8(src);
-            masterConfig.osdProfile.rssi_alarm = sbufReadU8(src);
-            masterConfig.osdProfile.cap_alarm = sbufReadU16(src);
-            masterConfig.osdProfile.time_alarm = sbufReadU16(src);
-            masterConfig.osdProfile.alt_alarm = sbufReadU16(src);
-        }
-        // set a position setting
-        else {
-            masterConfig.osdProfile.item_pos[addr] = sbufReadU16(src);
+        {
+            const uint8_t addr = sbufReadU8(src);
+            // set all the other settings
+            if ((int8_t)addr == -1) {
+#ifdef USE_MAX7456
+                masterConfig.vcdProfile.video_system = sbufReadU8(src);
+#else
+                sbufReadU8(src); // Skip video system
+#endif
+                masterConfig.osdProfile.units = sbufReadU8(src);
+                masterConfig.osdProfile.rssi_alarm = sbufReadU8(src);
+                masterConfig.osdProfile.cap_alarm = sbufReadU16(src);
+                masterConfig.osdProfile.time_alarm = sbufReadU16(src);
+                masterConfig.osdProfile.alt_alarm = sbufReadU16(src);
+            } else {
+                // set a position setting
+                masterConfig.osdProfile.item_pos[addr] = sbufReadU16(src);
+            }
         }
         break;
     case MSP_OSD_CHAR_WRITE:
-        addr = sbufReadU8(src);
-        for (int i = 0; i < 54; i++) {
-            font_data[i] = sbufReadU8(src);
-        }
 #ifdef USE_MAX7456
-        // !!TODO - replace this with a device independent implementation
-        max7456WriteNvm(addr, font_data);
+        {
+            uint8_t font_data[64];
+            const uint8_t addr = sbufReadU8(src);
+            for (int i = 0; i < 54; i++) {
+                font_data[i] = sbufReadU8(src);
+            }
+            // !!TODO - replace this with a device independent implementation
+            max7456WriteNvm(addr, font_data);
+        }
+#else
+        // just discard the data
+        sbufReadU8(src);
+        for (int i = 0; i < 54; i++) {
+            sbufReadU8(src);
+        }
 #endif
         break;
 #endif
diff --git a/src/main/io/osd.c b/src/main/io/osd.c
index d3a7111af..342bb4047 100755
--- a/src/main/io/osd.c
+++ b/src/main/io/osd.c
@@ -619,6 +619,7 @@ static void osdRefresh(uint32_t currentTime)
     if (!displayIsGrabbed(osdDisplayPort)) {
         osdUpdateAlarms();
         osdDrawElements();
+        displayHeartbeat(osdDisplayPort); // heartbeat to stop Minim OSD going back into native mode
 #ifdef OSD_CALLS_CMS
     } else {
         cmsUpdate(currentTime);
@@ -641,9 +642,14 @@ void osdUpdate(uint32_t currentTime)
 #endif // MAX7456_DMA_CHANNEL_TX
 
     // redraw values in buffer
-    if (counter++ % 5 == 0) {
+#ifdef USE_MAX7456
+#define DRAW_FREQ_DENOM 5
+#else
+#define DRAW_FREQ_DENOM 10 // MWOSD @ 115200 baud
+#endif
+    if (counter++ % DRAW_FREQ_DENOM == 0) {
         osdRefresh(currentTime);
-    } else { // rest of time redraw screen 10 chars per idle to don't lock the main idle
+    } else { // rest of time redraw screen 10 chars per idle so it doesn't lock the main idle
         displayDrawScreen(osdDisplayPort);
     }
 
diff --git a/src/main/main.c b/src/main/main.c
index b761dab8f..f57575873 100644
--- a/src/main/main.c
+++ b/src/main/main.c
@@ -412,8 +412,6 @@ void init(void)
         displayPort_t *osdDisplayPort = max7456DisplayPortInit(&masterConfig.vcdProfile);
 #else
         displayPort_t *osdDisplayPort = displayPortMspInit();
-        // grab the OSD to stop the minim OSD writing to it autonomously
-        displayGrab(osdDisplayPort);
 #endif
         osdInit(osdDisplayPort);
     }