Fixes to CMakeLists.txt