Assorted minor changes across all templates.