Fix many threat and melee ranges