diff --git a/firmware/controllers/actuators/aux_pid.cpp b/firmware/controllers/actuators/aux_pid.cpp
index 91c6df24c7..0d8d6d381d 100644
--- a/firmware/controllers/actuators/aux_pid.cpp
+++ b/firmware/controllers/actuators/aux_pid.cpp
@@ -23,7 +23,7 @@
 
 #if defined(HAS_OS_ACCESS)
 #error "Unexpected OS ACCESS HERE"
-#endif
+#endif /* HAS_OS_ACCESS */
 
 EXTERN_ENGINE
 ;
diff --git a/firmware/controllers/injector_central.cpp b/firmware/controllers/injector_central.cpp
index 6e596b6f48..f4d46f8910 100644
--- a/firmware/controllers/injector_central.cpp
+++ b/firmware/controllers/injector_central.cpp
@@ -37,12 +37,12 @@
 #include "idle_thread.h"
 #include "periodic_thread_controller.h"
 #include "tps.h"
+#include "cj125.h"
+#include "malfunction_central.h"
 
 #if EFI_PROD_CODE
-#include "cj125.h"
 #include "rusefi.h"
 #include "mpu_util.h"
-#include "malfunction_central.h"
 #endif /* EFI_PROD_CODE */
 
 #if (BOARD_TLE8888_COUNT > 0)
@@ -312,9 +312,11 @@ void executeTSCommand(uint16_t subsystem, uint16_t index) {
 		// cmd_test_idle_valve
 #if EFI_IDLE_CONTROL
 		startIdleBench();
-#endif
+#endif /* EFI_IDLE_CONTROL */
 	} else if (subsystem == 0x18) {
+#if EFI_CJ125
 		cjCalibrate();
+#endif /* EFI_CJ125 */
 	} else if (subsystem == 0x20 && index == 0x3456) {
 		// call to pit
 		setCallFromPitStop(30000);
diff --git a/unit_tests/tests/test_util.cpp b/unit_tests/tests/test_util.cpp
index 2c1e98546e..1d312ab6d7 100644
--- a/unit_tests/tests/test_util.cpp
+++ b/unit_tests/tests/test_util.cpp
@@ -146,14 +146,14 @@ TEST(util, histogram) {
 
 static void testMalfunctionCentralRemoveNonExistent() {
 	print("******************************************* testMalfunctionCentralRemoveNonExistent\r\n");
-	initMalfunctionCentral();
+	clearWarnings();
 
 	// this should not crash
 	removeError(OBD_Engine_Coolant_Temperature_Circuit_Malfunction);
 }
 
 static void testMalfunctionCentralSameElementAgain() {
-	initMalfunctionCentral();
+	clearWarnings();
 	print("******************************************* testMalfunctionCentralSameElementAgain\r\n");
 	error_codes_set_s localCopy;
 
@@ -164,7 +164,7 @@ static void testMalfunctionCentralSameElementAgain() {
 }
 
 static void testMalfunctionCentralRemoveFirstElement() {
-	initMalfunctionCentral();
+	clearWarnings();
 	print("******************************************* testMalfunctionCentralRemoveFirstElement\r\n");
 	error_codes_set_s localCopy;
 
@@ -190,7 +190,7 @@ TEST(misc, testMalfunctionCentral) {
 	testMalfunctionCentralRemoveFirstElement();
 
 	print("******************************************* testMalfunctionCentral\r\n");
-	initMalfunctionCentral();
+	clearWarnings();
 
 	error_codes_set_s localCopy;