Fix c++ things