diff --git a/src/eeprom_rlc.cpp b/src/eeprom_rlc.cpp
index 8e828daec..13c776c9a 100644
--- a/src/eeprom_rlc.cpp
+++ b/src/eeprom_rlc.cpp
@@ -1028,10 +1028,6 @@ void eeReadAll()
 
 void eeCheck(bool immediately)
 {
-  if (EEPROM_MASSSTORAGE()) {
-    return;
-  }
-
   if (immediately) {
     eeFlush();
   }
diff --git a/src/opentx.cpp b/src/opentx.cpp
index a5f9e098f..d79658a23 100644
--- a/src/opentx.cpp
+++ b/src/opentx.cpp
@@ -3635,25 +3635,27 @@ void perMain()
   }
 #endif
 
-// TODO merge these 2 branches
+  if (!usbPlugged()) {
+    // TODO merge these 2 branches
 #if defined(PCBSKY9X)
-  if (Eeprom32_process_state != E32_IDLE)
-    ee32_process();
-  else if (TIME_TO_WRITE())
-    eeCheck(false);
+    if (Eeprom32_process_state != E32_IDLE)
+      ee32_process();
+    else if (TIME_TO_WRITE())
+      eeCheck(false);
 #elif defined(CPUARM)
-  if (theFile.isWriting())
-    theFile.nextWriteStep();
-  else if (TIME_TO_WRITE())
-    eeCheck(false);
-#else
-  if (!eeprom_buffer_size) {
     if (theFile.isWriting())
       theFile.nextWriteStep();
     else if (TIME_TO_WRITE())
       eeCheck(false);
-  }
+#else
+    if (!eeprom_buffer_size) {
+      if (theFile.isWriting())
+        theFile.nextWriteStep();
+      else if (TIME_TO_WRITE())
+        eeCheck(false);
+    }
 #endif
+  }
 
 #if defined(SDCARD)
   sdMountPoll();
@@ -3773,7 +3775,7 @@ void perMain()
   const char *warn = s_warning;
   uint8_t menu = s_menu_count;
 
-  if (EEPROM_MASSSTORAGE()) {
+  if (usbPlugged()) {
     menuMainView(0);
   }
   else {
diff --git a/src/protocols/dsm2_arm.cpp b/src/protocols/dsm2_arm.cpp
index 2bd7a7fad..6550d8160 100644
--- a/src/protocols/dsm2_arm.cpp
+++ b/src/protocols/dsm2_arm.cpp
@@ -72,17 +72,17 @@ void sendByteDsm2(uint8_t b) //max 10changes 0 10 10 10 10 1
           len += BITLEN_DSM2;
         }
         else {
-          _send_1(nlev ? len-5 : len+3);
+          _send_1(len); // _send_1(nlev ? len-5 : len+3);
           len  = BITLEN_DSM2;
           lev  = nlev;
         }
         b = (b>>1) | 0x80; //shift in stop bit
     }
-    _send_1(len+BITLEN_DSM2+3); // 2 stop bits
+    _send_1(len+BITLEN_DSM2); // _send_1(len+BITLEN_DSM2+3); // 2 stop bits
 }
 void putDsm2Flush()
 {
-  dsm2StreamPtr--; //remove last stopbits and
+  // dsm2StreamPtr--; //remove last stopbits and
   *dsm2StreamPtr++ = 44010;             // Past the 44000 of the ARR
 }
 #else
diff --git a/src/targets/gruvin9x/board_gruvin9x.h b/src/targets/gruvin9x/board_gruvin9x.h
index f74695e86..65c5e2f04 100644
--- a/src/targets/gruvin9x/board_gruvin9x.h
+++ b/src/targets/gruvin9x/board_gruvin9x.h
@@ -85,6 +85,7 @@
 bool sdMounted();
 void sdMountPoll();
 void sdPoll10ms();
+#define sdDone()
 
 #define SD_IS_HC()               (0)
 #define SD_GET_BLOCKNR()         (0)
@@ -179,7 +180,8 @@ uint8_t pwrCheck();
 void pwrOff();
 #define UNEXPECTED_SHUTDOWN() ((mcusr & (1 << WDRF)) || g_eeGeneral.unexpectedShutdown)
 
-#define EEPROM_MASSSTORAGE() (0)
+// USB fake driver
+#define usbPlugged()    false
 
 // Haptic driver
 #define hapticOff() // TODO hapticOn() cleaner ...
diff --git a/src/targets/mega2560/board_mega2560.h b/src/targets/mega2560/board_mega2560.h
index 645f9a477..993aff540 100644
--- a/src/targets/mega2560/board_mega2560.h
+++ b/src/targets/mega2560/board_mega2560.h
@@ -45,6 +45,7 @@ void sdPoll10ms();
 uint8_t pwrCheck();
 #define UNEXPECTED_SHUTDOWN() ((mcusr & (1 << WDRF)) || g_eeGeneral.unexpectedShutdown)
 
-#define EEPROM_MASSSTORAGE() (0)
+// USB fake driver
+#define usbPlugged()    false
 
 #endif
diff --git a/src/targets/sky9x/board_sky9x.h b/src/targets/sky9x/board_sky9x.h
index 7710309fc..a36d3595f 100644
--- a/src/targets/sky9x/board_sky9x.h
+++ b/src/targets/sky9x/board_sky9x.h
@@ -244,7 +244,6 @@ uint32_t pwrCheck();
 
 // EEPROM driver
 void eepromInit();
-#define EEPROM_MASSSTORAGE()  (0)
 
 // Rotary Encoder driver
 void rotencInit();
diff --git a/src/targets/stock/board_stock.h b/src/targets/stock/board_stock.h
index 5e19f127e..3430f3d87 100644
--- a/src/targets/stock/board_stock.h
+++ b/src/targets/stock/board_stock.h
@@ -229,6 +229,7 @@ extern uint8_t RotEncoder ;
 void rotencPoll();
 #endif
 
-#define EEPROM_MASSSTORAGE() (0)
+// USB fake driver
+#define usbPlugged()    false
 
 #endif
diff --git a/src/targets/taranis/board_taranis.h b/src/targets/taranis/board_taranis.h
index c03b93d88..b3afaba90 100644
--- a/src/targets/taranis/board_taranis.h
+++ b/src/targets/taranis/board_taranis.h
@@ -172,7 +172,6 @@ void pwrOff();
 void usbInit(void);
 void usbStart(void);
 bool usbPlugged(void);
-#define EEPROM_MASSSTORAGE()  usbPlugged()
 
 // EEPROM driver
 #if !defined(SIMU)