Few minor changes to main CMakeLists.txt