Other minor changes.

All sample library calls in sample code.