Fix small CMakeLists.txt bugs