diff --git a/firmware/controllers/engine_cycle/fuel_schedule.cpp b/firmware/controllers/engine_cycle/fuel_schedule.cpp
index 50b73e53e5..18a343e1e2 100644
--- a/firmware/controllers/engine_cycle/fuel_schedule.cpp
+++ b/firmware/controllers/engine_cycle/fuel_schedule.cpp
@@ -10,7 +10,7 @@
 
 void turnInjectionPinHigh(InjectionEvent *event) {
 	efitick_t nowNt = getTimeNowNt();
-	for (int i = 0;i < MAX_WIRES_COUNT;i++) {
+	for (size_t i = 0; i < efi::size(event->outputs); i++) {
 		InjectorOutputPin *output = event->outputs[i];
 
 		if (output) {
diff --git a/firmware/controllers/engine_cycle/fuel_schedule.h b/firmware/controllers/engine_cycle/fuel_schedule.h
index a4df8fe5ba..46e5ae38b7 100644
--- a/firmware/controllers/engine_cycle/fuel_schedule.h
+++ b/firmware/controllers/engine_cycle/fuel_schedule.h
@@ -13,7 +13,6 @@
 
 #define MAX_WIRES_COUNT 2
 
-
 class InjectionEvent {
 public:
 	InjectionEvent();
diff --git a/firmware/controllers/engine_cycle/main_trigger_callback.cpp b/firmware/controllers/engine_cycle/main_trigger_callback.cpp
index c3d33615bf..ee1813a497 100644
--- a/firmware/controllers/engine_cycle/main_trigger_callback.cpp
+++ b/firmware/controllers/engine_cycle/main_trigger_callback.cpp
@@ -54,7 +54,7 @@ void endSimultaneousInjection(InjectionEvent *event) {
 void turnInjectionPinLow(InjectionEvent *event) {
 	efitick_t nowNt = getTimeNowNt();
 
-	for (int i = 0;i<MAX_WIRES_COUNT;i++) {
+	for (size_t i = 0; i < efi::size(event->outputs); i++) {
 		InjectorOutputPin *output = event->outputs[i];
 		if (output) {
 			output->close(nowNt);
diff --git a/firmware/controllers/system/efi_gpio.cpp b/firmware/controllers/system/efi_gpio.cpp
index d6dabffa33..77fc1a9654 100644
--- a/firmware/controllers/system/efi_gpio.cpp
+++ b/firmware/controllers/system/efi_gpio.cpp
@@ -50,7 +50,7 @@ static const char* const injectorNames[] = { "Injector 1", "Injector 2", "Inject
 		"Injector 7", "Injector 8", "Injector 9", "Injector 10", "Injector 11", "Injector 12"};
 
 static const char* const injectorShortNames[] = { PROTOCOL_INJ1_SHORT_NAME, "i2", "i3", "i4", "i5", "i6", "i7", "i8",
-		"j9", "iA", "iB", "iC"};
+		"i9", "iA", "iB", "iC"};
 
 static const char* const auxValveShortNames[] = { "a1", "a2"};
 
diff --git a/unit_tests/tests/trigger/test_trigger_decoder.cpp b/unit_tests/tests/trigger/test_trigger_decoder.cpp
index 222f503a44..3bac4c4118 100644
--- a/unit_tests/tests/trigger/test_trigger_decoder.cpp
+++ b/unit_tests/tests/trigger/test_trigger_decoder.cpp
@@ -528,10 +528,11 @@ static void setTestBug299(EngineTestHelper *eth) {
 	assertEqualsM("duty for maf=0", 7.5, getInjectorDutyCycle(round(Sensor::getOrZero(SensorType::Rpm))));
 }
 
-static void assertInjectors(const char *msg, int value0, int value1) {
-	EXPECT_EQ(value0, enginePins.injectors[0].m_currentLogicValue);
-	EXPECT_EQ(value1, enginePins.injectors[1].m_currentLogicValue);
-}
+#define assertInjectors(msg, value0, value1) \
+do { \
+	EXPECT_EQ(value0, enginePins.injectors[0].m_currentLogicValue) << msg; \
+	EXPECT_EQ(value1, enginePins.injectors[1].m_currentLogicValue) << msg; \
+} while (false);
 
 static void setArray(float* p, size_t count, float value) {
 	while (count--) {