Minor tweaks.

Change-Id: I7a560ec7cfa390361868c50355d38c6eca601844