Fix bugs with end of turn / next turn