more C++ upgrades