Copy/markup tweaks to templates, from a validation run