Migrate to C++ compiler
Reduce an amount of compile warnings