Fix some doc comment errors that were preventing build.
Merge pull request #1484 from shaver/doc-comment-fixes

Fix some doc comment errors that were preventing build.