Batch bug fixes