diff --git a/code/espurna/homeassistant.cpp b/code/espurna/homeassistant.cpp
index 31033a42..d96d6318 100644
--- a/code/espurna/homeassistant.cpp
+++ b/code/espurna/homeassistant.cpp
@@ -82,8 +82,8 @@ struct ha_config_t {
         deviceConfig.createNestedArray("identifiers").add(identifier.c_str());
         deviceConfig["name"] = name.c_str();
         deviceConfig["sw_version"] = version.c_str();
-        deviceConfig["manufacturer"] = getDevice().c_str();
-        deviceConfig["model"] = getManufacturer().c_str();
+        deviceConfig["manufacturer"] = getManufacturer().c_str();
+        deviceConfig["model"] = getDevice().c_str();
     }
 
     ha_config_t() : ha_config_t(DEFAULT_BUFFER_SIZE) {}
diff --git a/code/espurna/ir.cpp b/code/espurna/ir.cpp
index 50433228..7422e297 100644
--- a/code/espurna/ir.cpp
+++ b/code/espurna/ir.cpp
@@ -67,9 +67,9 @@ Raw messages:
         uint8_t _ir_repeat_size = 0;   // size of repeat array
         uint16_t * _ir_raw;            // array for sending codes and repeat codes
     #else
-        uint8_t _ir_type = 0;          // Type of encoding
-        uint64_t _ir_code = 0;         // Code to transmit
-        uint16_t _ir_bits = 0;         // Code bits
+        decode_type_t _ir_type = UNUSED;    // Type of encoding
+        uint64_t _ir_code = 0;              // Code to transmit
+        uint16_t _ir_bits = 0;              // Code bits
     #endif
 
     uint8_t _ir_repeat = 0;            // count of times repeating of repeat_code
@@ -208,7 +208,7 @@ void _irMqttCallback(unsigned int type, const char * topic, const char * payload
 
                 if (col > 0) {
 
-                    _ir_type = data.toInt();
+                    _ir_type = static_cast<decode_type_t>(data.toInt());
                     _ir_code = strtoul(data.substring(col+1).c_str(), NULL, 10);
 
                     col = data.indexOf(":", col+1);