Minor changes in CMake files