More fixes to the C++ guide

More fixes to the C++ guide