Small fixes for recent documentation changes.
Merge pull request #1618 from nawroth/docs-fixes

Small fixes for recent documentation changes.