EquipmentConfig fixes (WIP)