Seems like the right-clicking is a problem. If you drag and drop another weapon instead, the ammo gets updated - I was able to fix the HEVY that way. Still doesn't work for the shield, which has no ammo type, so the old invalid ammo stays even if you drag the shield.