diff --git a/firmware/controllers/engine_controller.cpp b/firmware/controllers/engine_controller.cpp
index 932b327c31..87a656cf53 100644
--- a/firmware/controllers/engine_controller.cpp
+++ b/firmware/controllers/engine_controller.cpp
@@ -290,7 +290,7 @@ static void resetAccel(void) {
 	engine->engineLoadAccelEnrichment.resetAE();
 	engine->tpsAccelEnrichment.resetAE();
 
-	for (int i = 0; i < sizeof(engine->wallFuel) / sizeof(engine->wallFuel[0]); i++)
+	for (unsigned int i = 0; i < sizeof(engine->wallFuel) / sizeof(engine->wallFuel[0]); i++)
 	{
 		engine->wallFuel[i].resetWF();
 	}
diff --git a/firmware/controllers/trigger/decoders/trigger_honda.cpp b/firmware/controllers/trigger/decoders/trigger_honda.cpp
index 0d07aef98e..42d7987c84 100644
--- a/firmware/controllers/trigger/decoders/trigger_honda.cpp
+++ b/firmware/controllers/trigger/decoders/trigger_honda.cpp
@@ -173,8 +173,6 @@ void configureHondaCbr600(TriggerShape *s) {
 
 	s->setTriggerSynchronizationGap(6);
 
-	// w = 15
-	float w = 720 / 2 / 24;
 
 	int totalTeethCount = 24;
 	int skippedCount = 0;
@@ -182,6 +180,8 @@ void configureHondaCbr600(TriggerShape *s) {
 	addSkippedToothTriggerEvents(T_SECONDARY, s, totalTeethCount, skippedCount, 0.5, 0, 720,
 	0, 349);
 
+	// w = 15
+	// float w = 720 / 2 / 24;
 
 	//s->addEvent720(360 -w, T_SECONDARY, TV_RISE);
 
diff --git a/firmware/controllers/trigger/decoders/trigger_structure.cpp b/firmware/controllers/trigger/decoders/trigger_structure.cpp
index 29f0a4e1cc..62824046bc 100644
--- a/firmware/controllers/trigger/decoders/trigger_structure.cpp
+++ b/firmware/controllers/trigger/decoders/trigger_structure.cpp
@@ -241,7 +241,7 @@ void TriggerShape::addEvent(angle_t angle, trigger_wheel_e const channelIndex, t
 	}
 
 	int exactMatch = wave.findAngleMatch(angle, privateTriggerDefinitionSize);
-	if (exactMatch != EFI_ERROR_CODE) {
+	if (exactMatch != (int)EFI_ERROR_CODE) {
 		warning(CUSTOM_ERR_SAME_ANGLE, "same angle: not supported");
 		setShapeDefinitionError(true);
 		return;
diff --git a/firmware/controllers/trigger/main_trigger_callback.cpp b/firmware/controllers/trigger/main_trigger_callback.cpp
index 6573ed24c9..7e103cdb5b 100644
--- a/firmware/controllers/trigger/main_trigger_callback.cpp
+++ b/firmware/controllers/trigger/main_trigger_callback.cpp
@@ -505,7 +505,7 @@ void mainTriggerCallback(trigger_event_e ckpSignalType, uint32_t trgEventIndex D
 
 	efiAssertVoid(CUSTOM_IGN_MATH_STATE, !CONFIG(useOnlyRisingEdgeForTrigger) || CONFIG(ignMathCalculateAtIndex) % 2 == 0, "invalid ignMathCalculateAtIndex");
 
-	if (trgEventIndex == CONFIG(ignMathCalculateAtIndex)) {
+	if (trgEventIndex == (uint32_t)CONFIG(ignMathCalculateAtIndex)) {
 		if (CONFIG(externalKnockSenseAdc) != EFI_ADC_NONE) {
 			float externalKnockValue = getVoltageDivided("knock", engineConfiguration->externalKnockSenseAdc PASS_ENGINE_PARAMETER_SUFFIX);
 			engine->knockLogic(externalKnockValue PASS_ENGINE_PARAMETER_SUFFIX);