diff --git a/radio/src/gui/128x64/radio_sdmanager.cpp b/radio/src/gui/128x64/radio_sdmanager.cpp
index f173660f4..866da9cf7 100644
--- a/radio/src/gui/128x64/radio_sdmanager.cpp
+++ b/radio/src/gui/128x64/radio_sdmanager.cpp
@@ -137,7 +137,10 @@ void menuRadioSdManager(event_t _event)
 #endif
     case EVT_KEY_FIRST(KEY_ENTER):
     {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wtype-limits"
       if (menuVerticalPosition >= HEADER_LINE) {
+#pragma GCC diagnostic pop
         vertpos_t index = menuVerticalPosition-HEADER_LINE-menuVerticalOffset;
         if (!reusableBuffer.sdmanager.lines[index][SD_SCREEN_FILE_LENGTH+1]) {
           f_chdir(reusableBuffer.sdmanager.lines[index]);
@@ -155,7 +158,10 @@ void menuRadioSdManager(event_t _event)
 
     case EVT_KEY_LONG(KEY_ENTER):
       killEvents(_event);
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wtype-limits"
       if (menuVerticalPosition < HEADER_LINE) {
+#pragma GCC diagnostic pop
         POPUP_MENU_ADD_ITEM(STR_SD_INFO);
         POPUP_MENU_ADD_ITEM(STR_SD_FORMAT);
       }
diff --git a/radio/src/gui/128x64/view_channels.cpp b/radio/src/gui/128x64/view_channels.cpp
index 175845898..1b7e335f5 100644
--- a/radio/src/gui/128x64/view_channels.cpp
+++ b/radio/src/gui/128x64/view_channels.cpp
@@ -101,11 +101,11 @@ void menuChannelsView(event_t event)
 #endif
 
       // Gauge
-#ifdef MIXERS_MONITOR
-      uint16_t lim = mixersView ? 512*2*2 : (g_model.extendedLimits ? 640*2 : 512*2);
-#else
-      uint16_t lim = g_model.extendedLimits ? 640*2 : 512*2;
-#endif
+// #ifdef MIXERS_MONITOR
+//       uint16_t lim = mixersView ? 512*2*2 : (g_model.extendedLimits ? 640*2 : 512*2);
+// #else
+//       uint16_t lim = g_model.extendedLimits ? 640*2 : 512*2;
+// #endif
       // TODO ? drawGauge(x+LCD_W/2-3-wbar-ofs, y, wbar, 6, val, lim);
 
       ch++;
diff --git a/tools/commit-tests.sh b/tools/commit-tests.sh
index 6bc810abc..346587e27 100755
--- a/tools/commit-tests.sh
+++ b/tools/commit-tests.sh
@@ -85,21 +85,21 @@ make -j${CORES} gtests ; ./gtests
 
 # OpenTX on X7D
 rm -rf *
-cmake ${COMMON_OPTIONS} -DPCB=X7D -DHELI=YES ${SRCDIR}
+cmake ${COMMON_OPTIONS} -DPCB=X7D -DHELI=YES -DWARNINGS_AS_ERRORS=YES ${SRCDIR}
 make -j${CORES} firmware
 make -j${CORES} simu
 make -j${CORES} gtests ; ./gtests
 
 # OpenTX on X9D
 rm -rf *
-cmake ${COMMON_OPTIONS} -DPCB=X9D -DHELI=YES -DLUA=YES -DWARNINGS_AS_ERRORS=YES ${SRCDIR}
+cmake ${COMMON_OPTIONS} -DPCB=X9D -DHELI=YES -DLUA=YES -DGVARS=YES -DWARNINGS_AS_ERRORS=YES ${SRCDIR}
 make -j${CORES} firmware
 make -j${CORES} simu
 make -j${CORES} gtests ; ./gtests
 
 # OpenTX on X9D+
 rm -rf *
-cmake ${COMMON_OPTIONS} -DPCB=X9D -DHELI=YES -DLUA=YES -DWARNINGS_AS_ERRORS=YES ${SRCDIR}
+cmake ${COMMON_OPTIONS} -DPCB=X9D -DHELI=YES -DLUA=YES -DGVARS=YES -DWARNINGS_AS_ERRORS=YES ${SRCDIR}
 make -j${CORES} firmware
 make -j${CORES} simu
 make -j${CORES} gtests ; ./gtests