A few template updates