Fixed some CMakeLists.txt minor problems