Various template updates