Minor CMake bugfixes.