Miscellaneous template changes