Minor template fixes.