Fixes to make the queues interact properly.