fix message broker bugs