MQTT changes/perf related, fixing the instance being initialized more th...

...an once