Pulled in minor doc fixes from main repo.