Couple of CMake-related bugfixes.