Feature/amqp fixes