Some minor template updates