Fix minor template issues.

Change-Id: I0b25ebebdb06e70c42397d516f2b029a4b0f60cd