some basic C++ fixes
that's what happens when committing without compiling before