Fixed a couple merge problems in WeaponInvisibility