Fix Archetype packages