Fixing Validations