Minor changes in templates