Fixed smaller issues with the mq_listener