Improved some validations