Fix the Doxygen issues