Minor template improvements for older templates.

Some additional minor template improvements / fixes to some of the older templates.