Some doc fixes
Merge branch 'dev' into ms