minor tweaks to improve C4 win check