Minor adjustments to CMakeLists.txt