Some fixes in doc

(backported from 2.1)