Fix more validation errors.