More MQTT fixes.