CXX improvements