Quite a few bugfixes in the 'batch' processing