minor changes in templates