diff --git a/firmware/controllers/algo/engine.cpp b/firmware/controllers/algo/engine.cpp
index 8416947e93..53ebd41247 100644
--- a/firmware/controllers/algo/engine.cpp
+++ b/firmware/controllers/algo/engine.cpp
@@ -109,8 +109,7 @@ void Engine::init() {
 
 static bool stopPin(NamedOutputPin *output) {
 #if EFI_PROD_CODE || defined(__DOXYGEN__)
-	bool_t isInitialized = output->port != NULL;
-	if (isInitialized && output->getLogicValue()) {
+	if (output->isInitialized() && output->getLogicValue()) {
 		output->setValue(false);
 		scheduleMsg(&logger, "turning off %s", output->name);
 		return true;
diff --git a/firmware/controllers/core/fsio_impl.cpp b/firmware/controllers/core/fsio_impl.cpp
index ebdb3dbc2b..868b93caae 100644
--- a/firmware/controllers/core/fsio_impl.cpp
+++ b/firmware/controllers/core/fsio_impl.cpp
@@ -237,7 +237,7 @@ static void setPinState(const char * msg, OutputPin *pin, LEElement *element, En
 		warning(OBD_PCM_Processor_Fault, "invalid expression for %s", msg);
 	} else {
 		int value = calc.getValue2(element, engine);
-		if (value != pin->getLogicValue()) {
+		if (pin->isInitialized() && value != pin->getLogicValue()) {
 			if (isRunningBenchTest())
 				return; // let's not mess with bench testing
 			scheduleMsg(logger, "setPin %s %s", msg, value ? "on" : "off");
diff --git a/firmware/controllers/system/efiGpio.cpp b/firmware/controllers/system/efiGpio.cpp
index 5b38eb8a07..d73f7e6a43 100644
--- a/firmware/controllers/system/efiGpio.cpp
+++ b/firmware/controllers/system/efiGpio.cpp
@@ -35,6 +35,14 @@ OutputPin::OutputPin() {
 #endif
 }
 
+bool_t OutputPin::isInitialized() {
+#if EFI_PROD_CODE || defined(__DOXYGEN__)
+	return port != NULL;
+#else
+	return false;
+#endif
+}
+
 void OutputPin::setValue(int logicValue) {
 	doSetOutputPinValue2(this, logicValue);
 }
diff --git a/firmware/controllers/system/efiGpio.h b/firmware/controllers/system/efiGpio.h
index 2c78608539..8208a6c4da 100644
--- a/firmware/controllers/system/efiGpio.h
+++ b/firmware/controllers/system/efiGpio.h
@@ -21,6 +21,7 @@
 class OutputPin {
 public:
 	OutputPin();
+	bool_t isInitialized();
 	void setValue(int logicValue);
 	void setDefaultPinState(pin_output_mode_e *defaultState);
 	bool_t getLogicValue();
diff --git a/firmware/util/datalogging.cpp b/firmware/util/datalogging.cpp
index 67a22d7be5..a066705970 100644
--- a/firmware/util/datalogging.cpp
+++ b/firmware/util/datalogging.cpp
@@ -47,12 +47,12 @@
 static MemoryStream intermediateLoggingBuffer;
 static uint8_t intermediateLoggingBufferData[INTERMEDIATE_LOGGING_BUFFER_SIZE] CCM_OPTIONAL;
 //todo define max-printf-buffer
-static bool intermediateLoggingBufferInited = FALSE;
+static bool_t intermediateLoggingBufferInited = false;
 
 /**
  * @returns true if data does not fit into this buffer
  */
-static INLINE bool validateBuffer(Logging *logging, uint32_t extraLen) {
+static INLINE bool_t validateBuffer(Logging *logging, uint32_t extraLen) {
 	if (logging->buffer == NULL) {
 		firmwareError("Logging not initialized: %s", logging->name);
 		return true;
@@ -60,7 +60,7 @@ static INLINE bool validateBuffer(Logging *logging, uint32_t extraLen) {
 
 	if (remainingSize(logging) < extraLen + 1) {
 #if EFI_PROD_CODE
-		warning(OBD_PCM_Processor_Fault, "buffer overflow %s", logging->name);
+		warning(OBD_PCM_Processor_Fault, "output overflow %s", logging->name);
 #endif
 		return true;
 	}
@@ -70,7 +70,7 @@ static INLINE bool validateBuffer(Logging *logging, uint32_t extraLen) {
 void append(Logging *logging, const char *text) {
 	efiAssertVoid(text != NULL, "append NULL");
 	uint32_t extraLen = efiStrlen(text);
-	int isError = validateBuffer(logging, extraLen);
+	bool_t isError = validateBuffer(logging, extraLen);
 	if (isError) {
 		return;
 	}