fix mistakes from tok_itr merge