documentation updates to reflect upstream fixes 3