More CMake modifications