Misc changes in CMakeLists.txt and Doxyfile