batch fixes