Fixing CXX variable