Some more validation for matches