Minor template fixes.
Minor template fixes.
merge