diff --git a/src/ems-esp.cpp b/src/ems-esp.cpp
index d4fa344b4..ccb0619ad 100644
--- a/src/ems-esp.cpp
+++ b/src/ems-esp.cpp
@@ -771,7 +771,7 @@ void publishEMSValues(bool force) {
                 strlcat(hc, _int_to_char(s, mixing->hc), sizeof(hc));
                 JsonObject dataMixing = rootMixing.createNestedObject(hc);
 
-                if (mixing->flowTemp != EMS_VALUE_SHORT_NOTSET)
+                if (mixing->flowTemp != EMS_VALUE_USHORT_NOTSET)
                     dataMixing["flowTemp"] = (float)mixing->flowTemp / 10;
                 if (mixing->flowSetTemp != EMS_VALUE_INT_NOTSET)
                     dataMixing["setflowTemp"] = mixing->flowSetTemp;
diff --git a/src/ems.cpp b/src/ems.cpp
index a39d6a2cc..6287f392a 100644
--- a/src/ems.cpp
+++ b/src/ems.cpp
@@ -1235,7 +1235,7 @@ void _process_EasyStatusMessage(_EMS_RxTelegram * EMS_RxTelegram) {
     _setValue(EMS_RxTelegram, &EMS_Thermostat.hc[hc].setpoint_roomTemp, EMS_OFFSET_EasyStatusMessage_setpoint); // is * 100
 }
 
-// 0x01D7, 0x01D8
+// Mixer - 0x01D7, 0x01D8
 void _process_MMPLUSStatusMessage(_EMS_RxTelegram * EMS_RxTelegram) {
     uint8_t hc = (EMS_RxTelegram->type - EMS_TYPE_MMPLUSStatusMessage_HC1); // 0 to 3
     if (hc >= EMS_THERMOSTAT_MAXHC) {
@@ -1248,9 +1248,9 @@ void _process_MMPLUSStatusMessage(_EMS_RxTelegram * EMS_RxTelegram) {
     _setValue(EMS_RxTelegram, &EMS_Mixing.hc[hc].valveStatus, EMS_OFFSET_MMPLUSStatusMessage_valve_status);
 }
 
-// 0xAB
+// Mixer - 0xAB
 void _process_MMStatusMessage(_EMS_RxTelegram * EMS_RxTelegram) {
-    uint8_t hc               = 0; // fixed, for 0xAB
+    uint8_t hc               = 0; // fixed, for 0xAB (HC1 only
     EMS_Mixing.hc[hc].active = true;
 
     _setValue(EMS_RxTelegram, &EMS_Mixing.hc[hc].flowTemp, EMS_OFFSET_MMStatusMessage_flow_temp);