diff --git a/firmware/controllers/sensors/frequency_sensor.cpp b/firmware/controllers/sensors/frequency_sensor.cpp
index 739e5b6911..1af5e94f0d 100644
--- a/firmware/controllers/sensors/frequency_sensor.cpp
+++ b/firmware/controllers/sensors/frequency_sensor.cpp
@@ -8,10 +8,12 @@
 
 #include "digital_input_exti.h"
 
+#if EFI_PROD_CODE
 // Callback adapter since we can't pass a member function to a callback
 static void freqSensorExtiCallback(void* arg, efitick_t nowNt) {
 	reinterpret_cast<FrequencySensor*>(arg)->onEdge(nowNt);
 }
+#endif // EFI_PROD_CODE
 
 void FrequencySensor::initIfValid(brain_pin_e pin, SensorConverter &converter, float filterParameter) {
 	if (!isBrainPinValid(pin)) {
diff --git a/firmware/hw_layer/smart_gpio.h b/firmware/hw_layer/smart_gpio.h
index 34ada0d399..511a30b535 100644
--- a/firmware/hw_layer/smart_gpio.h
+++ b/firmware/hw_layer/smart_gpio.h
@@ -17,7 +17,9 @@
 // we seem OK without L9779 here do we need those includes at all?
 #endif /* EFI_PROD_CODE */
 
-#if EFI_UNIT_TEST
+#if EFI_SIMULATOR
+#define BOARD_EXT_GPIOCHIPS 0
+#elif EFI_UNIT_TEST || EFI_SIMULATOR
 #define BOARD_EXT_GPIOCHIPS 3
 #else
 #define BOARD_EXT_GPIOCHIPS (\
diff --git a/simulator/simulator/efifeatures.h b/simulator/simulator/efifeatures.h
index 798fa09b4b..a3ee7a2af7 100644
--- a/simulator/simulator/efifeatures.h
+++ b/simulator/simulator/efifeatures.h
@@ -27,6 +27,11 @@
 #define EFI_DYNO_VIEW FALSE
 #define EFI_ONBOARD_MEMS FALSE
 #define EFI_DAC FALSE
+#define EFI_HELLA_OIL FALSE
+#define EFI_USE_OPENBLT FALSE
+#define EFI_CAN_SERIAL FALSE
+#define EFI_TS_SCATTER FALSE
+#define EFI_SOFTWARE_KNOCK FALSE
 #define HW_CHECK_ALWAYS_STIMULATE FALSE
 #define _HAS_STATIC_RTTI FALSE
 #define __GXX_RTTI FALSE