Some more changes in the doc samples

Here is some more changes for the docs samples.