2nd batch fixes