MQTTS FIX minor bugs