Matchmaking issues (7/26)

Matchmaking issues