minor fixes in c++ index