Minor fixes.

Change-Id: I69452ee4e7cb95e4f978c69f5c67e2daa2e63094