Fix defects from review 329