C++ build fixes