Various batch fixes.