Minor template changes