Misc batch fixes