more C++ driver update fixes