Doc fixes from master