Merge "Fixed warnings and errors in Doc"