Combat Resolution Fixes