Improve C++ settings