School fixes: Matches