Minor changes in template