Fix some bad win logic