Merge "fix docs errors"