Minor C++ tweaks