Fix the doxygen issues