Batch report fixes