Other minor batch changes

No match.