Fix Feral Charge and Beacon of Light Combat issues