A few fixes to make sure Gateway works for RabbitMQ