10.6 compile fixes for C++