A few quick changes to the batch implementation.