Fixing up the queue a bit