diff --git a/src/main/config/config.c b/src/main/config/config.c
index 826fd88b56..212669a674 100755
--- a/src/main/config/config.c
+++ b/src/main/config/config.c
@@ -500,7 +500,11 @@ static void resetConf(void)
 
     resetSerialConfig(&masterConfig.serialConfig);
 
+#if defined(STM32F10X) && !defined(CC3D)
+    masterConfig.emf_avoidance = 1;
+#else
     masterConfig.emf_avoidance = 0;
+#endif
 
     resetPidProfile(&currentProfile->pidProfile);
 	
diff --git a/src/main/drivers/pwm_output.c b/src/main/drivers/pwm_output.c
index 25d51892ee..cce25e3403 100644
--- a/src/main/drivers/pwm_output.c
+++ b/src/main/drivers/pwm_output.c
@@ -134,7 +134,17 @@ static void pwmWriteStandard(uint8_t index, uint16_t value)
 {
     *motors[index]->ccr = value;
 }
+#if defined(STM32F10X) && !defined(CC3D)
+static void pwmWriteOneshot125(uint8_t index, uint16_t value)
+{
+    *motors[index]->ccr = value * 21 / 6;  // 24Mhz -> 8Mhz
+}
 
+static void pwmWriteOneshot42(uint8_t index, uint16_t value)
+{
+    *motors[index]->ccr = value * 7 / 6;
+}
+#else
 static void pwmWriteOneshot125(uint8_t index, uint16_t value)
 {
     *motors[index]->ccr = value * 3;  // 24Mhz -> 8Mhz
@@ -144,6 +154,7 @@ static void pwmWriteOneshot42(uint8_t index, uint16_t value)
 {
     *motors[index]->ccr = value;
 }
+#endif
 
 static void pwmWriteMultiShot(uint8_t index, uint16_t value)
 {
diff --git a/src/main/io/serial_cli.c b/src/main/io/serial_cli.c
index 685c092726..9070714cb8 100644
--- a/src/main/io/serial_cli.c
+++ b/src/main/io/serial_cli.c
@@ -526,9 +526,9 @@ typedef struct {
 } clivalue_t;
 
 const clivalue_t valueTable[] = {
-    { "emf_avoidance",              VAR_UINT8  | MASTER_VALUE | MODE_LOOKUP,  &masterConfig.emf_avoidance, .config.lookup = { TABLE_OFF_ON } },
+//    { "emf_avoidance",              VAR_UINT8  | MASTER_VALUE | MODE_LOOKUP,  &masterConfig.emf_avoidance, .config.lookup = { TABLE_OFF_ON } },
 
-	{ "mid_rc",                     VAR_UINT16 | MASTER_VALUE,  &masterConfig.rxConfig.midrc, .config.minmax = { 1200,  1700 } },
+    { "mid_rc",                     VAR_UINT16 | MASTER_VALUE,  &masterConfig.rxConfig.midrc, .config.minmax = { 1200,  1700 } },
     { "min_check",                  VAR_UINT16 | MASTER_VALUE,  &masterConfig.rxConfig.mincheck, .config.minmax = { PWM_RANGE_ZERO,  PWM_RANGE_MAX } },
     { "max_check",                  VAR_UINT16 | MASTER_VALUE,  &masterConfig.rxConfig.maxcheck, .config.minmax = { PWM_RANGE_ZERO,  PWM_RANGE_MAX } },
     { "rssi_channel",               VAR_INT8   | MASTER_VALUE,  &masterConfig.rxConfig.rssi_channel, .config.minmax = { 0,  MAX_SUPPORTED_RC_CHANNEL_COUNT } },