Fixing some validations