Minor changes to archetypes