Various fixes (Celluloid, AMQP)