Doc fixes 1.7

Don't merge this til after 1.7 release.