Small CMake adjustments