Merge pull request #344 from peternewman/trivial-fixes

Fix even more Doxygen comment warnings