diff --git a/radio/src/Makefile b/radio/src/Makefile
index 220106882..deb1aa184 100644
--- a/radio/src/Makefile
+++ b/radio/src/Makefile
@@ -1155,6 +1155,7 @@ CPPFLAGS += $(CPPDEFS)
 CPPFLAGS += -Wall
 CPPFLAGS += -fno-exceptions
 CPPFLAGS += -Wno-strict-aliasing
+CPPFLAGS += -Wformat -Wreturn-type -Wunused -Wuninitialized -Wunknown-pragmas -Wno-switch -Wtype-limits
 INCFLAGS = $(patsubst %,-I%,$(INCDIRS))
 EXTRAINCFLAGS = $(patsubst %,-I%,$(EXTRAINCDIRS))
 
@@ -1443,7 +1444,7 @@ ifeq ($(ARCH), AVR)
 	$(CC) $(AVRCPPFLAGS) $< --output $@ $(LDFLAGS)
 else
 %.o: %.c
-	$(CC) $(ARMCPPFLAGS) $< -o $@
+	$(CC) $(ARMCPPFLAGS) -Wimplicit $< -o $@
 %.o: %.s
 	$(AS) $< -o $@
 TMP = $(SRC:.c=.o)
diff --git a/radio/src/lua.cpp b/radio/src/lua.cpp
index 3338c2ece..c74987ac1 100644
--- a/radio/src/lua.cpp
+++ b/radio/src/lua.cpp
@@ -1820,7 +1820,11 @@ void luaDoOneRunPermanentScript(uint8_t evt, int i)
     const char *filename;
 #endif
     ScriptInputsOutputs * sio = NULL;
+#if SCRIPT_MIX_FIRST > 0
     if (sid.reference >= SCRIPT_MIX_FIRST && sid.reference <= SCRIPT_MIX_LAST) {
+#else
+    if (sid.reference <= SCRIPT_MIX_LAST) {
+#endif
       ScriptData & sd = g_model.scriptsData[sid.reference-SCRIPT_MIX_FIRST];
       sio = &scriptInputsOutputs[sid.reference-SCRIPT_MIX_FIRST];
       inputsCount = sio->inputsCount;