Fix scary frame when entering match, fix expected still clearing if win set