Fix CMakeLists bugs introduced by merge