Some more (probably useless) queue tweaks.