fixes and clearing of batch operations