cherrypick example fixes from v0.1