Minor template updates