Doc fixes

Resolve #595