Some queue-router related fixes and specs