Fix a few bugs in c++ owari