bugfixes in CMake files