Some CMake changes