Make transaction handling for all batch operations consistent