Tweak queues and stuff

Change-Id: Ib6f9d55475abbfc234cf22e6107f0af5704a6ec9