Fix remaining validator issues.
More validator errors.