Batch support bug fixes