diff --git a/src/model_menus.cpp b/src/model_menus.cpp
index 3e32b7308..d2b1ad6a6 100644
--- a/src/model_menus.cpp
+++ b/src/model_menus.cpp
@@ -2821,7 +2821,11 @@ void menuModelCustomFunctions(uint8_t event)
             }
 #if defined(DEBUG)
             else if (sd->func == FUNC_TEST) {
+#if defined(GVARS)
               func_displayed = FUNC_TEST - 16 - NUM_STICKS - MAX_GVARS + 2;
+#else
+              func_displayed = FUNC_TEST - 16 - NUM_STICKS + 1;
+#endif
             }
 #endif
 #if defined(GVARS)
diff --git a/src/open9x.cpp b/src/open9x.cpp
index 72a959fad..561c3f8ff 100644
--- a/src/open9x.cpp
+++ b/src/open9x.cpp
@@ -619,7 +619,9 @@ int16_t getValue(uint8_t i)
   else if(i<MIXSRC_TrimAil) return calc1000toRESX((int16_t)8 * getTrimValue(s_perout_flight_phase, i-(NUM_STICKS+NUM_POTS+NUM_ROTARY_ENCODERS)));
   else if(i<MIXSRC_MAX) return 1024;
 #if defined(PCBX9D)
-  // TODO
+  else if(i==MIXSRC_SA) return (keyState(SW_SA0) ? -1024 : 1024);
+  else if(i==MIXSRC_SB) return (keyState(SW_SB0) ? -1024 : (keyState(SW_SB1) ? 0 : 1024));
+  else if(i==MIXSRC_SC) return (keyState(SW_SC0) ? -1024 : (keyState(SW_SC1) ? 0 : 1024));
 #else
   else if(i<MIXSRC_3POS) return (keyState(SW_ID0) ? -1024 : (keyState(SW_ID1) ? 0 : 1024));
   // here the switches are skipped
@@ -1872,8 +1874,6 @@ void testFunc()
 #ifdef SIMU
   printf("testFunc\n"); fflush(stdout);
 #endif
-
-  while (1);
 }
 #endif