Fixes for mqtt feature