Fix up the queue controllers.