Minor template fixes