Minor CMake improvements