A few minor template updates