Fixes a couple of cases of things not taking the player to the right places