Fixed matchmaking bugs