Minor template adjustments