Context-based Combat Fixes