Minor changes for template manager module