More tweaks for MQTT related changes.