++compile, minor fixes for the CMake build system