Validation fixes #1