Minor template location adjustments.