change some template issues