diff --git a/firmware/controllers/system_fsio.txt b/firmware/controllers/system_fsio.txt
index 8a6148ca9f..2074e7119b 100644
--- a/firmware/controllers/system_fsio.txt
+++ b/firmware/controllers/system_fsio.txt
@@ -9,9 +9,9 @@
 # Andrey Belomutskiy, (c) 2012-2017
 #
 
-FAN_CONTROL_LOGIC=(fan and (coolant > fan_off_setting)) | (coolant > fan_on_setting) | is_clt_broken
+FAN_CONTROL_LOGIC=(fan and (coolant > cfg_fanOffTemperature)) | (coolant > cfg_fanOnTemperature) | is_clt_broken
 
-FUEL_PUMP_LOGIC=(time_since_boot < startup_fuel_pump_duration) | (rpm > 0)
+FUEL_PUMP_LOGIC=(time_since_boot >= 0 & time_since_boot < startup_fuel_pump_duration) | (rpm > 0)
 
 ALTERNATOR_LOGIC=vbatt < 14.5
 
@@ -23,7 +23,8 @@ AC_RELAY_LOGIC=ac_on_switch & rpm > 850
 COMBINED_WARNING_LIGHT=(rpm > fsio_setting(2)) | ((coolant > fsio_setting(3)) | (vbatt < fsio_setting(4)))
 
 #needed by EFI_MAIN_RELAY_CONTROL
-MAIN_RELAY_LOGIC=(time_since_boot < 2) | (vbatt > 5) | in_shutdown
+#MAIN_RELAY_LOGIC=(time_since_boot >= 0 & time_since_boot < 2) | (vbatt > 5) | in_shutdown
+MAIN_RELAY_LOGIC=(vbatt > 5) | in_shutdown
 
 # could be used for simple variable intake geometry setups or warning light or starter block
 RPM_ABOVE_USER_SETTING_1=rpm > fsio_setting(1)