fixing more amqp related issues