Assorted minor changes across all templates. Pass 2