Fixed some template