Small CMake improvements