Fix bugs that arise with two players