Minor tweaks to the CMake files.