Minor fixes.

Change-Id: I8382daff085a97329a263c39cb6903528b39afcf