misc fixes to combat.