Merge several minor doc fixes from 3.4