fix mistakes from tok_itr merge
Merge branch 'master' into cct-mktemp-bsd