Minor CMakeLists.txt changes