Batch fixes