Batch runner fixes