Updates to work with the new doc/CmakeLists.txt