Fixes and doxygen graphs