diff --git a/radio/src/gui/colorlcd/menu_model.cpp b/radio/src/gui/colorlcd/menu_model.cpp
index d22848a53..07d365ca4 100644
--- a/radio/src/gui/colorlcd/menu_model.cpp
+++ b/radio/src/gui/colorlcd/menu_model.cpp
@@ -46,7 +46,9 @@ ModelMenu::ModelMenu():
   addTab(new ModelMixesPage());
   addTab(new ModelOutputsPage());
   addTab(new ModelCurvesPage());
+#if defined(GVARS)
   addTab(new ModelGVarsPage());
+#endif
   addTab(new ModelLogicalSwitchesPage());
   addTab(new SpecialFunctionsPage(g_model.customFn));
 #if defined(LUA_MODEL_SCRIPTS)
diff --git a/radio/src/gui/colorlcd/model_outputs.cpp b/radio/src/gui/colorlcd/model_outputs.cpp
index a3eb53357..438ea4ce0 100644
--- a/radio/src/gui/colorlcd/model_outputs.cpp
+++ b/radio/src/gui/colorlcd/model_outputs.cpp
@@ -78,16 +78,23 @@ class OutputEditWindow : public Page {
       new StaticText(window, grid.getLabelSlot(), TR_MIN, 0,
                      COLOR_THEME_PRIMARY1);
       new GVarNumberEdit(window, grid.getFieldSlot(), -limit, 0,
-                         GET_SET_DEFAULT(output->min), 0, PREC1,
-                         -LIMIT_STD_MAX);
+                         GET_SET_DEFAULT(output->min), 0, PREC1
+#if defined(GVARS)
+                         , -LIMIT_STD_MAX
+#endif
+                         );
+
       grid.nextLine();
 
       // Max
       new StaticText(window, grid.getLabelSlot(), TR_MAX, 0,
                      COLOR_THEME_PRIMARY1);
       new GVarNumberEdit(window, grid.getFieldSlot(), 0, +limit,
-                         GET_SET_DEFAULT(output->max), 0, PREC1,
-                         +LIMIT_STD_MAX);
+                         GET_SET_DEFAULT(output->max), 0, PREC1
+#if defined(GVARS)
+                         , +LIMIT_STD_MAX
+#endif
+                         );
       grid.nextLine();
 
       // Direction