Minor fixes
Clean up batch to align more with enj