Merge pull request #311 from peternewman/trivial-fixes

Fix some more Doxygen issues