last batch fixes