Minor fixes to make "proof of concept" work.

Change-Id: I7685b8f5db4bcfeec0a27e7b23c233c6d4146cb9