Fixed some bugs with wrong player winning