Fix some things that C++ doesn't like so we don't lose the possibility to use the...