diff --git a/src/gruvin9x/somo14d.h b/src/gruvin9x/somo14d.h
index 417f0a75f..e8575379d 100644
--- a/src/gruvin9x/somo14d.h
+++ b/src/gruvin9x/somo14d.h
@@ -34,7 +34,7 @@
 #define PROMPT_SYSTEM_BASE      230
 #define PROMPT_CUSTOM_BASE      256
 
-#define pushCustomPrompt(p) pushPrompt(PROMPT_CUSTOM_BASE+v)
+#define pushCustomPrompt(p) pushPrompt(PROMPT_CUSTOM_BASE+p)
 extern void pushPrompt(uint16_t prompt);
 extern bool isPlaying();
 
diff --git a/src/model_menus.cpp b/src/model_menus.cpp
index 50f92ff02..b97ad9a88 100644
--- a/src/model_menus.cpp
+++ b/src/model_menus.cpp
@@ -1550,16 +1550,8 @@ void menuProcExpoOne(uint8_t event)
         break;
 #endif
       case EXPO_FIELD_WIDTH:
-        {
-#if defined(PCBARM)
-          lcd_outdezAtt(EXPO_ONE_2ND_COLUMN+3*FW, y, ed->weight, attr|INFLIGHT(ed->weight));
-          if (attr) CHECK_INFLIGHT_INCDEC_MODELVAR(event, ed->weight, 0, 100, 0, STR_DRWEIGHT);
-#else
-          PREPARE_INFLIGHT_BITFIELD(&ed->expo - 1);
-          lcd_outdezAtt(EXPO_ONE_2ND_COLUMN+3*FW, y, ed->weight, attr|INFLIGHT(*bitfield));
-          if (attr) CHECK_INFLIGHT_INCDEC_MODELVAR_BITFIELD(event, ed->weight, 0, 100, 0, STR_DRWEIGHT, 1);
-#endif
-        }
+        lcd_outdezAtt(EXPO_ONE_2ND_COLUMN+3*FW, y, ed->weight, attr|INFLIGHT((int8_t&)ed->weight));
+        if (attr) CHECK_INFLIGHT_INCDEC_MODELVAR(event, (int8_t&)ed->weight, 0, 100, 0, STR_DRWEIGHT);
         break;
       case EXPO_FIELD_EXPO:
         if (ed->curveMode==MODE_EXPO || ed->curveParam==0) {