Validation improvements
Name typo...