Improved broker update and matt keepAlive handling