Minor tweaks.

Change-Id: I08036029c1512cf6e2f5a114268c8ff686f95a55