Fix minor template issues.