Update to support new EjectOnDeath.