Fixes two bugs

Hit these bugs while upgrading to archetype 1.0.