fix matchmaking bugs