...
...
Fixes to AMQP