Fixes to the new batch functionality...