Merge pull request #1486 from alex/docs-fixes

A handful of different fixes for the interface docs