Template fixes observed in testing.