Fix archetype issues