Misc. fixes and new queue deployment