Fix dependency loops in RMQ