Re #6314. Doxygen documentation.
Re #6096. Fix typo