Minor fixes on examples

Change-Id: I01299a99c8c937272f4aeab1e87da18bb6ebcf79