Fix up Batch spec