Minor changes in CMake file