RabbitMQ fixes