Matchmaking issues (20/26)

Matchmaking issues