more fixes to matchmaking