more example usage tweaks

Change-Id: I0cd919d3d28a9c5e13715a3f84996cf05ea4b294