diff --git a/src/devices/boiler.cpp b/src/devices/boiler.cpp
index 8de8636d6..c20c40a6e 100644
--- a/src/devices/boiler.cpp
+++ b/src/devices/boiler.cpp
@@ -577,7 +577,7 @@ Boiler::Boiler(uint8_t device_type, int8_t device_id, uint8_t product_id, const
                           FL_(wwSelTempSingle),
                           DeviceValueUOM::DEGREES,
                           MAKE_CF_CB(set_ww_temp_single));
-    register_device_value(DeviceValueTAG::TAG_BOILER_DATA_WW, &wwSolarTemp_, DeviceValueType::USHORT, FL_(wwSolarTemp), DeviceValueUOM::DEGREES);
+    register_device_value(DeviceValueTAG::TAG_BOILER_DATA_WW, &wwSolarTemp_, DeviceValueType::USHORT, DeviceValueNumOp::DV_NUMOP_DIV10, FL_(wwSolarTemp), DeviceValueUOM::DEGREES);
     register_device_value(DeviceValueTAG::TAG_BOILER_DATA_WW, &wwType_, DeviceValueType::ENUM, FL_(enum_flow), FL_(wwType), DeviceValueUOM::NONE);
     register_device_value(DeviceValueTAG::TAG_BOILER_DATA_WW,
                           &wwComfort_,
diff --git a/src/emsdevice.cpp b/src/emsdevice.cpp
index 704fcf8b8..c0cd2c67e 100644
--- a/src/emsdevice.cpp
+++ b/src/emsdevice.cpp
@@ -157,6 +157,14 @@ uint8_t EMSdevice::device_name_2_device_type(const char * topic) {
         return DeviceType::ANALOGSENSOR;
     }
 
+    if (!strcmp(lowtopic, F_(switch))) {
+        return DeviceType::SWITCH;
+    }
+
+    if (!strcmp(lowtopic, F_(gateway))) {
+        return DeviceType::GATEWAY;
+    }
+
     return DeviceType::UNKNOWN;
 }