diff --git a/src/model_menus.cpp b/src/model_menus.cpp
index 815244cbe..4d87da636 100644
--- a/src/model_menus.cpp
+++ b/src/model_menus.cpp
@@ -1596,7 +1596,12 @@ void menuProcMixOne(uint8_t event)
   TITLEP(s_currCh ? STR_INSERTMIX : STR_EDITMIX);
   MixData *md2 = mixaddress(s_currIdx) ;
   putsChn(lcdLastPos+1*FW,0,md2->destCh+1,0);
+
+#if defined(PCBARM)
+  SUBMENU_NOTITLE(MIX_FIELD_COUNT, {sizeof(md2->name), 0, 0, 0, 1, 1, 0, MAX_PHASES-1, 0 /*, ...*/});
+#else
   SUBMENU_NOTITLE(MIX_FIELD_COUNT, {0, 0, 0, 1, 1, 0, MAX_PHASES-1, 0 /*, ...*/});
+#endif
 
   int8_t  sub = m_posVert;
 
@@ -1648,23 +1653,24 @@ void menuProcMixOne(uint8_t event)
 
         if (attr) {
           if (md2->curveMode==MODE_CURVE) {
-            CHECK_INCDEC_MODELVAR(event, md2->curveParam, -MAX_CURVES, CURVE_BASE+MAX_CURVES);
-            if (md2->curveParam == CURVE_BASE+MAX_CURVES) {
-              md2->curveMode = MODE_DIFFERENTIAL;
-              md2->curveParam = 0;
-            }
-            if (event==EVT_KEY_FIRST(KEY_MENU) && md2->curveMode==MODE_CURVE && (md2->curveParam<0 || md2->curveParam>=CURVE_BASE)){
+            if (event==EVT_KEY_FIRST(KEY_MENU) && (md2->curveParam<0 || md2->curveParam>=CURVE_BASE)){
               s_curveChan = (md2->curveParam<0 ? -md2->curveParam-1 : md2->curveParam-CURVE_BASE);
               pushMenu(menuProcCurveOne);
             }
+            CHECK_INCDEC_MODELVAR(event, md2->curveParam, -MAX_CURVES, CURVE_BASE+MAX_CURVES-1);
+            if (md2->curveParam == 0)
+              md2->curveMode = MODE_DIFFERENTIAL;
             m_posHorz = 0;
             if (s_editMode > 0) s_editMode = 0;
           }
           else if (s_editMode>0) {
             if (m_posHorz==0) {
-              CHECK_INCDEC_MODELVAR(event, md2->curveMode, -1, 1);
-              if (md2->curveMode == MODE_CURVE)
-                md2->curveParam = CURVE_BASE+MAX_CURVES-1;
+              int8_t tmp = 0;
+              CHECK_INCDEC_MODELVAR(event, tmp, -1, 1);
+              if (tmp != 0) {
+                md2->curveMode = MODE_CURVE;
+                md2->curveParam = tmp;
+              }
             }
             else {
               CHECK_INCDEC_MODELVAR(event, md2->curveParam, -100, 100);
diff --git a/src/myeeprom.h b/src/myeeprom.h
index bc3c5adee..862a54ffb 100644
--- a/src/myeeprom.h
+++ b/src/myeeprom.h
@@ -259,8 +259,8 @@ enum MixSources {
 #define MLTPX_MUL   1
 #define MLTPX_REP   2
 
-#define MODE_CURVE         0
-#define MODE_DIFFERENTIAL  1
+#define MODE_DIFFERENTIAL  0
+#define MODE_CURVE         1
 
 #if defined(PCBARM)
 #define MAX_DELAY   60 /* 30 seconds */
diff --git a/src/open9x.cpp b/src/open9x.cpp
index 802592704..fc4c91818 100644
--- a/src/open9x.cpp
+++ b/src/open9x.cpp
@@ -1059,7 +1059,7 @@ void checkTHR()
 {
   if (g_model.disableThrottleWarning) return;
 
-  int thrchn = (2-(stickMode&1));//stickMode=0123 -> thr=2121
+  int8_t thrchn = (2-(stickMode&1)); //stickMode=0123 -> thr=2121
 
 #ifdef SIMU
   int16_t lowLim = THRCHK_DEADBAND - 1024 ;