Some fixes in CMake.