CMake file minor fixes