Tweaks to CombatData