Template fixes

Minor adjustments