- more fixes in c++ patch