Minor template adjustments.