Minor fixes.

Change-Id: Iafb4f4a27ce6b6a4765ccc11afe9124968344e99