Fix some validations