Minor updates.

Change-Id: Iad0ac468c2238408f513951b79ef27f33004def8