C++ compliance fixes for Linux dev.