Fix issues with player death