Fix queues and batches