Merge "Fix docs errors and warnings"