Fixing some template types.