fixed some broker and mongo issues