Fix validation errors.
Merge pull request #59 from Ferada/validation-fixes

Fix validation errors.