Fix up queues and define defaults
Merge branch 'master' into deploy