Minor adjustments to CMakeLists