Fix DPR and Survivability calculations