add fixes for CXX options