Fix validation explosion and typo.