amqp fixes