Little changes to CMake