Fixing errors with End of Turn/Round