Fixed some template stuff.