Bug fixes to archetypes