Fix some more Doxygen issues
Fix some minor case issues
Merge pull request #311 from peternewman/trivial-fixes

Fix some more Doxygen issues
Resync with trunk