CMakeLists.txt fixes