Documentation fixes

A few documentation fixes to cherry-pick.