fixes for new AMQP buffering