Validation fixes #3