Batch operations fix