Fixes to new doc/CMakeLists.txt