Backported fixes in POMs and archetypes