C++ driver fixes