Merge "Fix docs issues"