diff --git a/firmware/controllers/sensors/allsensors.cpp b/firmware/controllers/sensors/allsensors.cpp
index 9c9b0f1407..b0a8c746c1 100644
--- a/firmware/controllers/sensors/allsensors.cpp
+++ b/firmware/controllers/sensors/allsensors.cpp
@@ -13,7 +13,7 @@ ButtonDebounce acDebounce("ac_switch");
 
 void initSensors() {
 	initMapDecoder();
-	acDebounce.init(15, engineConfiguration->acSwitch, engineConfiguration->acSwitchMode);
+	acDebounce.init(MS2NT(15), engineConfiguration->acSwitch, engineConfiguration->acSwitchMode);
 }
 
 bool getAcToggle() {
diff --git a/firmware/controllers/start_stop.cpp b/firmware/controllers/start_stop.cpp
index cc544d5d35..1b58a0dd71 100644
--- a/firmware/controllers/start_stop.cpp
+++ b/firmware/controllers/start_stop.cpp
@@ -6,5 +6,5 @@ ButtonDebounce startStopButtonDebounce("start_button");
 
 void initStartStopButton() {
 	/* startCrankingDuration is efitimesec_t, so we need to multiply it by 1000 to get milliseconds*/
-	startStopButtonDebounce.init((engineConfiguration->startCrankingDuration*1000), engineConfiguration->startStopButtonPin, engineConfiguration->startStopButtonMode);
+	startStopButtonDebounce.init(MS2NT(engineConfiguration->startCrankingDuration * 1000), engineConfiguration->startStopButtonPin, engineConfiguration->startStopButtonMode);
 }
diff --git a/firmware/controllers/tcu/buttonshift.cpp b/firmware/controllers/tcu/buttonshift.cpp
index e8d0c42e3f..912d4886b1 100644
--- a/firmware/controllers/tcu/buttonshift.cpp
+++ b/firmware/controllers/tcu/buttonshift.cpp
@@ -22,8 +22,8 @@ ButtonShiftController::ButtonShiftController() :
 
 void ButtonShiftController::init() {
 	// 500 millisecond is maybe a little long?
-	debounceUp.init(500, engineConfiguration->tcuUpshiftButtonPin, engineConfiguration->tcuUpshiftButtonPinMode);
-	debounceDown.init(500, engineConfiguration->tcuDownshiftButtonPin, engineConfiguration->tcuDownshiftButtonPinMode);
+	debounceUp.init(MS2NT(500), engineConfiguration->tcuUpshiftButtonPin, engineConfiguration->tcuUpshiftButtonPinMode);
+	debounceDown.init(MS2NT(500), engineConfiguration->tcuDownshiftButtonPin, engineConfiguration->tcuDownshiftButtonPinMode);
 
 	GearControllerBase::init();
 }
diff --git a/firmware/hw_layer/microsecond_timer/microsecond_timer.cpp b/firmware/hw_layer/microsecond_timer/microsecond_timer.cpp
index 5ba156514f..805c2d662c 100644
--- a/firmware/hw_layer/microsecond_timer/microsecond_timer.cpp
+++ b/firmware/hw_layer/microsecond_timer/microsecond_timer.cpp
@@ -138,7 +138,7 @@ static Timer testScheduling;
 
 static void timerValidationCallback(void*) {
 	testSchedulingHappened = true;
-	efitimems_t actualTimeSinceScheduling = 1e3 * testScheduling.getElapsedSeconds();
+	float actualTimeSinceScheduling = 1e3 * testScheduling.getElapsedSeconds();
 	
 	if (absI(actualTimeSinceScheduling - TEST_CALLBACK_DELAY) > TEST_CALLBACK_DELAY * TIMER_PRECISION_THRESHOLD) {
 		firmwareError(ObdCode::CUSTOM_ERR_TIMER_TEST_CALLBACK_WRONG_TIME, "hwTimer broken precision: %ld ms", actualTimeSinceScheduling);