Few minor template fixes.