Documentation fixes from master