Fix more defects for review 329