Jbatch changes

Fixes some errors introduced by the merge