Fixed minor issues on Promises and on amqp subscription