minor amqp/rabbitmq changes