CMake file minor changes