diff --git a/firmware/controllers/engine_cycle/spark_logic.h b/firmware/controllers/engine_cycle/spark_logic.h
index 24c8fb87fe..ef7bfcb238 100644
--- a/firmware/controllers/engine_cycle/spark_logic.h
+++ b/firmware/controllers/engine_cycle/spark_logic.h
@@ -20,7 +20,7 @@ void initializeIgnitionActions(DECLARE_ENGINE_PARAMETER_SIGNATURE);
 
 int isIgnitionTimingError(void);
 
-#define TRIGGER_EVENT_UNDEFINED -1
+#define TRIGGER_EVENT_UNDEFINED INT32_MAX
 bool scheduleOrQueue(AngleBasedEvent *event,
 		uint32_t trgEventIndex,
 		efitick_t edgeTimestamp,
diff --git a/unit_tests/Makefile b/unit_tests/Makefile
index b2d250f716..f1139b663a 100644
--- a/unit_tests/Makefile
+++ b/unit_tests/Makefile
@@ -23,7 +23,6 @@ ifeq ($(USE_OPT),)
   USE_OPT = -c -Wall -O0 -ggdb -g3
   USE_OPT += -fprofile-arcs -ftest-coverage
   USE_OPT += -Werror=missing-field-initializers
-  USE_OPT += -Wno-unused-parameter -Wno-unused-function
 endif
 
 
@@ -243,7 +242,7 @@ TOPT = -mthumb -DTHUMB
 CWARN = -Wall -Wextra -Wstrict-prototypes -pedantic -Wmissing-prototypes -Wold-style-definition
 
 # Define C++ warning options here
-CPPWARN = -Wall -Wextra
+CPPWARN = -Wall -Wextra -Wno-unused-parameter -Wno-unused-function -Wno-unused-variable -Wno-format -Wno-unused-parameter -Wno-unused-private-field
 
 #
 # Compiler settings