Minor template changes.