diff --git a/firmware/config/boards/hellen/small-can-board/board.mk b/firmware/config/boards/hellen/small-can-board/board.mk
index c740f36668..d9d8ec542f 100644
--- a/firmware/config/boards/hellen/small-can-board/board.mk
+++ b/firmware/config/boards/hellen/small-can-board/board.mk
@@ -12,12 +12,16 @@ DDEFS += -DDL_OUTPUT_BUFFER=1000
 DDEFS += -DEFI_LOGIC_ANALYZER=FALSE
 DDEFS += -DEFI_MALFUNCTION_INDICATOR=FALSE
 DDEFS += -DEFI_ENGINE_SNIFFER=FALSE
-DDEFS += -DEFI_ENGINE_SNIFFER=FALSE
 DDEFS += -DEFI_TCU=FALSE
 DDEFS += -DEFI_ENGINE_EMULATOR=FALSE
-DDEFS += -DEFI_SHAFT_POSITION_INPUT=FALSE
+# TODO flip to false
+DDEFS += -DEFI_SHAFT_POSITION_INPUT=TRUE
 DDEFS += -DEFI_ALTERNATOR_CONTROL=FALSE
 DDEFS += -DEFI_VVT_PID=FALSE
+DDEFS += -DEFI_EMULATE_POSITION_SENSORS=FALSE
+DDEFS += -DEFI_MAP_AVERAGING=FALSE
+DDEFS += -DEFI_HPFP=FALSE
+DDEFS += -DEFI_TOOTH_LOGGER=FALSE
 DDEFS += -DRAM_UNUSED_SIZE=100
 
 #Mass Storage
diff --git a/firmware/config/stm32f4ems/efifeatures.h b/firmware/config/stm32f4ems/efifeatures.h
index e7393340ca..c28c759f07 100644
--- a/firmware/config/stm32f4ems/efifeatures.h
+++ b/firmware/config/stm32f4ems/efifeatures.h
@@ -356,8 +356,9 @@
 #define CONSOLE_MAX_ACTIONS 180
 #endif
 
+#ifndef EFI_MAP_AVERAGING
 #define EFI_MAP_AVERAGING TRUE
-//#define EFI_MAP_AVERAGING FALSE
+#endif
 
 // todo: most of this should become configurable
 
diff --git a/firmware/controllers/lua/lua_hooks.cpp b/firmware/controllers/lua/lua_hooks.cpp
index 3d7e6f5d41..15c136f77a 100644
--- a/firmware/controllers/lua/lua_hooks.cpp
+++ b/firmware/controllers/lua/lua_hooks.cpp
@@ -686,7 +686,7 @@ void configureRusefiLuaHooks(lua_State* l) {
 	});
 #endif // EFI_LAUNCH_CONTROL
 
-#if EFI_SHAFT_POSITION_INPUT && !EFI_UNIT_TEST
+#if EFI_EMULATE_POSITION_SENSORS && !EFI_UNIT_TEST
 	lua_register(l, "selfStimulateRPM", [](lua_State* l) {
 		auto rpm = luaL_checkinteger(l, 1);
 		if (rpm < 1) {