Merge "Adding some doc fixes."