RabbitMQ scripts minor fixes