Fixes for docs
Merge pull request #2314 from ogail/bugfixes

Fixes for docs