Batch 2 fixup