Some doc fixes
Merge pull request #1390 from abotalov/doc_fixes

Some doc fixes