Fix defects from review