COMP: More Artichoke build changes