Fix up queues and define defaults