Couple of bugfixes for CMake code.