Matchmaking issues (16/26)

Matchmaking issues