Made some template comparison changes...