Various template changes.