CMake minor changes