More minor work on archetypes