Improve dead player handling