diff --git a/src/devices/boiler.cpp b/src/devices/boiler.cpp
index 130133672..485c17206 100644
--- a/src/devices/boiler.cpp
+++ b/src/devices/boiler.cpp
@@ -2419,7 +2419,8 @@ bool Boiler::set_flow_temp(const char * value, const int8_t id) {
     // no verify if value is unchanged, put it  to end of tx-queue, no priority
     // see https://github.com/emsesp/EMS-ESP32/issues/654, https://github.com/emsesp/EMS-ESP32/issues/954
     if (v == selFlowTemp_) {
-        EMSESP::txservice_.add(Telegram::Operation::TX_WRITE, device_id(), EMS_TYPE_UBASetPoints, 0, (uint8_t *)&v, 1, 0, false);
+        uint8_t v1 = v;
+        EMSESP::txservice_.add(Telegram::Operation::TX_WRITE, device_id(), EMS_TYPE_UBASetPoints, 0, &v1, 1, 0, false);
         return true;
     }
 
diff --git a/src/devices/thermostat.cpp b/src/devices/thermostat.cpp
index 00eb431d1..97f1925df 100644
--- a/src/devices/thermostat.cpp
+++ b/src/devices/thermostat.cpp
@@ -2010,7 +2010,7 @@ bool Thermostat::set_calinttemp(const char * value, const int8_t id) {
         write_command(0xB0, 0, t, 0xB0);
     } else if (model() == EMSdevice::EMS_DEVICE_FLAG_RC30) {
         write_command(EMS_TYPE_RC30Settings, 1, t, EMS_TYPE_RC30Settings);
-    } else if (model() == EMSdevice::EMS_DEVICE_FLAG_RC100H) {
+    } else if (model() == EMSdevice::EMS_DEVICE_FLAG_RC100H || model() == EMSdevice::EMS_DEVICE_FLAG_CR11) {
         write_command(0x273, 0, t, 0x273);
     } else if (model() == EMSdevice::EMS_DEVICE_FLAG_RC100) {
         write_command(0x241, 7, t, 0x241);