Small fixes to CMakeLists.txt

Summary: