Serveral fixes including new queues and REQUIRES.