mqtt minor fixes