More upgrade docs, minor fixes in a couple of places.
Merge pull request #1639 from nawroth/minor

More upgrade docs, minor fixes in a couple of places.