Data model fixes for equipping Borg upgrades