Some small tweaks to template files.