A few slight modifications to improve performance of some key batch operations