Index: lib/Comms/src/MqttClient.cpp
===================================================================
diff -u -raaebfee335c74b0250864a6dce0555f866adadea -re9aa2c82ccb8cb5662f05ed878d2f7b5ef9f4a65
--- lib/Comms/src/MqttClient.cpp	(.../MqttClient.cpp)	(revision aaebfee335c74b0250864a6dce0555f866adadea)
+++ lib/Comms/src/MqttClient.cpp	(.../MqttClient.cpp)	(revision e9aa2c82ccb8cb5662f05ed878d2f7b5ef9f4a65)
@@ -146,11 +146,7 @@
     connect(_client, &QMqttClient::stateChanged, this, &MqttClient::onStateChanged);
     connect(_client, &QMqttClient::messageStatusChanged, this, &MqttClient::didMessageStatusChanged);
     // Fires for every delivery on this connection, whichever subscription matched.
-    connect(_client, &QMqttClient::messageReceived, this,
-        [this](const QByteArray &message, const QMqttTopicName &topic) {
-            Q_EMIT didMessageReceived(topic.name(), message);
-        }
-    );
+    connect(_client, &QMqttClient::messageReceived, this, &MqttClient::didMessageReceived);
     connect(_client, &QMqttClient::errorChanged, this,
         [](QMqttClient::ClientError error) {
             if (error != QMqttClient::NoError) {
@@ -307,7 +303,7 @@
                 qCInfo(logMqtt).noquote() << "client connecting";
                 Q_EMIT didStateChanged(_client->state());
                 break;
-            case QMqttClient::Connected:
+            case QMqttClient::Connected:        // CONNACK
                 qCInfo(logMqtt).noquote() << "client connected";
                 // Subscriptions did not survive the previous client, so this is where
                 // a receiver re-establishes them.