diff --git a/lib/MyESP/MyESP.h b/lib/MyESP/MyESP.h
index d4d5f4573..74dcc2a4a 100644
--- a/lib/MyESP/MyESP.h
+++ b/lib/MyESP/MyESP.h
@@ -6,10 +6,10 @@
 
 #pragma once
 
-#ifndef MyEMS_h
-#define MyEMS_h
+#ifndef MyESP_h
+#define MyESP_h
 
-#define MYESP_VERSION "1.1.23"
+#define MYESP_VERSION "1.1.24"
 
 #include <ArduinoJson.h>
 #include <ArduinoOTA.h>
diff --git a/src/ds18.cpp b/src/ds18.cpp
index 547eb88cd..37aa6540b 100644
--- a/src/ds18.cpp
+++ b/src/ds18.cpp
@@ -11,7 +11,7 @@
 std::vector<ds_device_t> _devices;
 
 DS18::DS18() {
-    _wire     = NULL;
+    _wire     = nullptr;
     _count    = 0;
     _gpio     = GPIO_NONE;
     _parasite = 0;
diff --git a/src/ems.cpp b/src/ems.cpp
index 74a19893d..e6b58833c 100644
--- a/src/ems.cpp
+++ b/src/ems.cpp
@@ -117,7 +117,7 @@ const _EMS_Type EMS_Types[] = {
     {EMS_MODEL_UBA, EMS_TYPE_UBAMonitorWWMessage, "UBAMonitorWWMessage", _process_UBAMonitorWWMessage},
     {EMS_MODEL_UBA, EMS_TYPE_UBAParameterWW, "UBAParameterWW", _process_UBAParameterWW},
     {EMS_MODEL_UBA, EMS_TYPE_UBATotalUptimeMessage, "UBATotalUptimeMessage", _process_UBATotalUptimeMessage},
-    {EMS_MODEL_UBA, EMS_TYPE_UBAMaintenanceSettingsMessage, "UBAMaintenanceSettingsMessage", NULL},
+    {EMS_MODEL_UBA, EMS_TYPE_UBAMaintenanceSettingsMessage, "UBAMaintenanceSettingsMessage", nullptr},
     {EMS_MODEL_UBA, EMS_TYPE_UBAParametersMessage, "UBAParametersMessage", _process_UBAParametersMessage},
     {EMS_MODEL_UBA, EMS_TYPE_UBASetPoints, "UBASetPoints", _process_SetPoints},
 
@@ -742,7 +742,7 @@ void ems_parseTelegram(uint8_t * telegram, uint8_t length) {
      * buffer isn't valid anymore, so we must not answer at all...
      */
     if (EMS_Sys_Status.emsRxStatus != EMS_RX_STATUS_IDLE) {
-        myDebug_P(PSTR("** We missed the bus - Rx non-idle!")); //TODO tidy up error logging
+        myDebug_P(PSTR("** [DEBUG MODE] We missed the bus - Rx non-idle!")); //TODO tidy up error logging
         return;
     }
 
@@ -992,7 +992,7 @@ void _ems_processTelegram(_EMS_RxTelegram * EMS_RxTelegram) {
     // if it's a common type (across ems devices) or something specifically for us process it.
     // dest will be EMS_ID_NONE and offset 0x00 for a broadcast message
     if (typeFound) {
-        if ((EMS_Types[i].processType_cb) != (void *)NULL) {
+        if ((EMS_Types[i].processType_cb) != nullptr) {
             // print non-verbose message
             if ((EMS_Sys_Status.emsLogging == EMS_SYS_LOGGING_BASIC) || (EMS_Sys_Status.emsLogging == EMS_SYS_LOGGING_VERBOSE)) {
                 myDebug_P(PSTR("<--- %s(0x%02X)"), EMS_Types[i].typeString, type);
@@ -2355,7 +2355,7 @@ void ems_sendRawTelegram(char * telegram) {
     }
     // and interate until end
     while (p != 0) {
-        if ((p = strtok(NULL, " ,"))) {
+        if ((p = strtok(nullptr, " ,"))) {
             strlcpy(value, p, sizeof(value));
             uint8_t val                  = (uint8_t)strtol(value, 0, 16);
             EMS_TxTelegram.data[++count] = val;
@@ -2734,7 +2734,7 @@ void ems_testTelegram(uint8_t test_num) {
 
     // and interate until end
     while (p != 0) {
-        if ((p = strtok(NULL, " ,"))) {
+        if ((p = strtok(nullptr, " ,"))) {
             strlcpy(value, p, sizeof(value));
             uint8_t val        = (uint8_t)strtol(value, 0, 16);
             telegram[++length] = val;
diff --git a/src/emsuart.cpp b/src/emsuart.cpp
index d856a7bff..a701d25c3 100644
--- a/src/emsuart.cpp
+++ b/src/emsuart.cpp
@@ -95,7 +95,7 @@ static inline void ICACHE_FLASH_ATTR emsuart_flush_fifos() {
  */
 void ICACHE_FLASH_ATTR emsuart_init() {
     ETS_UART_INTR_DISABLE();
-    ETS_UART_INTR_ATTACH(NULL, NULL);
+    ETS_UART_INTR_ATTACH(nullptr, nullptr);
 
     // allocate and preset EMS Receive buffers
     for (int i = 0; i < EMS_MAXBUFFERS; i++) {
@@ -144,7 +144,7 @@ void ICACHE_FLASH_ATTR emsuart_init() {
     // swap Rx and Tx pins to use GPIO13 (D7) and GPIO15 (D8) respectively
     //system_uart_swap();
 
-    ETS_UART_INTR_ATTACH(emsuart_rx_intr_handler, NULL);
+    ETS_UART_INTR_ATTACH(emsuart_rx_intr_handler, nullptr);
     ETS_UART_INTR_ENABLE();
 }