Fixing queues and various improvements