Hopefully fix the final Doxygen warnings