CMake and Main.cpp corrections