CMake modifications