Fix match validations