misc Batch improvements
Merge pull request #2411 from vmilea/batch_fixes

misc Batch improvements