Fixing remaining problems in CMakeLists.txt