Final fixes to make regression archetypes compile.