Fix documentation errors reported during the build
Merge pull request #631 from sharwell/javadoc-issues

Fix documentation errors reported during the build