Fix minor C++ issues