fix defects from review