fixes related to c++ compilers