Added minor fixes to the CMakeList.txt