diff --git a/firmware/controllers/trigger/trigger_central.cpp b/firmware/controllers/trigger/trigger_central.cpp
index 49099028fa..839f31b611 100644
--- a/firmware/controllers/trigger/trigger_central.cpp
+++ b/firmware/controllers/trigger/trigger_central.cpp
@@ -174,7 +174,7 @@ extern engine_configuration2_s * engineConfiguration2;
 extern board_configuration_s *boardConfiguration;
 #endif
 
-static void triggerShapeInfo() {
+static void triggerShapeInfo(Engine *engine) {
 #if EFI_PROD_CODE || EFI_SIMULATOR
 	trigger_shape_s *s = &engineConfiguration2->triggerShape;
 	for (int i = 0; i < s->getSize(); i++) {
@@ -183,7 +183,7 @@ static void triggerShapeInfo() {
 #endif
 }
 
-static void triggerInfo() {
+static void triggerInfo(Engine *engine) {
 #if EFI_PROD_CODE || EFI_SIMULATOR
 	scheduleMsg(&logger, "Template %s/%d trigger %d", getConfigurationName(engineConfiguration->engineType),
 			engineConfiguration->engineType, engineConfiguration->triggerConfig.triggerType);
@@ -231,8 +231,8 @@ void initTriggerCentral(Engine *engine) {
 
 #if EFI_PROD_CODE || EFI_SIMULATOR
 	initLogging(&logger, "ShaftPosition");
-	addConsoleAction("triggerinfo", triggerInfo);
-	addConsoleAction("triggershapeinfo", triggerShapeInfo);
+	addConsoleActionP("triggerinfo", (VoidPtr)triggerInfo, engine);
+	addConsoleActionP("triggershapeinfo", (VoidPtr)triggerShapeInfo, engine);
 #endif
 
 #if EFI_HISTOGRAMS
diff --git a/firmware/iar/ch.ewp b/firmware/iar/ch.ewp
index 081ae2ad7d..24be2b8ab0 100644
--- a/firmware/iar/ch.ewp
+++ b/firmware/iar/ch.ewp
@@ -3194,7 +3194,7 @@
       <name>$PROJ_DIR$\..\util\histogram.h</name>
     </file>
     <file>
-      <name>$PROJ_DIR$\..\util\listener_array.c</name>
+      <name>$PROJ_DIR$\..\util\listener_array.cpp</name>
     </file>
     <file>
       <name>$PROJ_DIR$\..\util\listener_array.h</name>
diff --git a/firmware/rusefi.cpp b/firmware/rusefi.cpp
index ac380ece34..fa92ddebaa 100644
--- a/firmware/rusefi.cpp
+++ b/firmware/rusefi.cpp
@@ -133,6 +133,7 @@ void runRusEfi(void) {
 
 	// that's dirty, this assignment should be nicer or in a better spot
 	engine.engineConfiguration = engineConfiguration;
+	engine.engineConfiguration2 = engineConfiguration2;
 
 
 
diff --git a/firmware/util/listener_array.c b/firmware/util/listener_array.cpp
similarity index 98%
rename from firmware/util/listener_array.c
rename to firmware/util/listener_array.cpp
index 663b819a52..0505a31f34 100644
--- a/firmware/util/listener_array.c
+++ b/firmware/util/listener_array.cpp
@@ -1,5 +1,5 @@
 /*
- * listener_array.c
+ * @file listener_array.cpp
  *
  * @date Jan 1, 2013
  * @author Andrey Belomutskiy, (c) 2012-2014
diff --git a/firmware/util/util.mk b/firmware/util/util.mk
index ca11372772..7dd65ee922 100644
--- a/firmware/util/util.mk
+++ b/firmware/util/util.mk
@@ -1,11 +1,11 @@
 
 UTILSRC = $(PROJECT_DIR)/util/data_buffer.c \
-	$(PROJECT_DIR)/util/listener_array.c \
 	$(PROJECT_DIR)/util/crc.c \
 	$(PROJECT_DIR)/util/histogram.c \
 	$(PROJECT_DIR)/util/cli_registry.c
 	
 UTILSRC_CPP = $(PROJECT_DIR)/util/cyclic_buffer.cpp \
+	$(PROJECT_DIR)/util/listener_array.cpp \
 	$(PROJECT_DIR)/util/efilib.cpp \
 	$(PROJECT_DIR)/util/efilib2.cpp \
 	$(PROJECT_DIR)/util/LocalVersionHolder.cpp