Some nit fixes

Change-Id: Id9fb8a1a0f6edbe9e3b74daa523fd978af014e27