Fix batches