COMP: More changes to get Artichoke superbuild working