More matchmaking bugfix attempts