Fix some stuff with matchmaker.