Batch fix problems