Fixing up validations