Fix batch manager in single mode