Minor template updating for consistency