Docs: Small cleanups

Partial cherry-pick for c4b627d8.