Matchmaking issues (25/26)

Matchmaking issues