Minor updates to C++