A few more docs adjustments after review