Minor: Validation improvements.