Fixes bugs in mqtt_watch