Fixes to the reder queue, bit still it's a bit funky