Merge "Fixed some doc bugs"