Validation fixes #2