CMake improvements