FIxup consmetic issues with the default template.