Merge "Fix documentation errors"