Small tweaks for batch runs