Added fixes to CMakeLists.txt