Fix carrier validations