Cpl more bug fixes