A few more docs fixes
Merge pull request #1487 from alex/more-docs-fixes

A few more docs fixes