Fix up the queue