diff --git a/src/analogsensor.cpp b/src/analogsensor.cpp
index ac23b33ca..b791fef3c 100644
--- a/src/analogsensor.cpp
+++ b/src/analogsensor.cpp
@@ -533,7 +533,7 @@ void AnalogSensor::publish_values(const bool force) {
                 char val_obj[50];
                 char val_cond[95];
                 if (Mqtt::is_nested()) {
-                    snprintf(val_obj, sizeof(val_obj), "value_json['%02d'].value", sensor.gpio());
+                    snprintf(val_obj, sizeof(val_obj), "value_json['%02d'].value", sensor.gpio()); // TODO change for Domoticz
                     snprintf(val_cond, sizeof(val_cond), "value_json['%02d'] is defined and %s is defined", sensor.gpio(), val_obj);
                 } else {
                     snprintf(val_obj, sizeof(val_obj), "value_json['%s']", sensor.name().c_str());
diff --git a/src/telegram.h b/src/telegram.h
index 1fcf3d639..c8a0d472c 100644
--- a/src/telegram.h
+++ b/src/telegram.h
@@ -133,7 +133,7 @@ class Telegram {
         auto msg_size = (index - this->offset + num_bytes - 1);
 
         if ((index < this->offset) || (msg_size >= this->message_length) || (msg_size > EMS_MAX_TELEGRAM_MESSAGE_LENGTH)) {
-            return false; // TODO we should set value to a default value here
+            return false;
         }
 
         Value val = value;
diff --git a/src/temperaturesensor.cpp b/src/temperaturesensor.cpp
index 5d1a65ee8..658f55443 100644
--- a/src/temperaturesensor.cpp
+++ b/src/temperaturesensor.cpp
@@ -482,7 +482,7 @@ void TemperatureSensor::publish_values(const bool force) {
                 char val_obj[70];
                 char val_cond[170];
                 if (Mqtt::is_nested()) {
-                    snprintf(val_obj, sizeof(val_obj), "value_json['%s'].temp", sensor.id().c_str());
+                    snprintf(val_obj, sizeof(val_obj), "value_json['%s'].temp", sensor.id().c_str()); // TODO change for Domoticz
                     snprintf(val_cond, sizeof(val_cond), "value_json['%s'] is defined and %s is defined", sensor.id().c_str(), val_obj);
                 } else {
                     snprintf(val_obj, sizeof(val_obj), "value_json['%s']", sensor.name().c_str());