Fixing validations