CMakeLists updates