Matchmaking issues (6/26)

Matchmaking issues