Doc fixes
Merge doc fixes from master.