nit fixes!

Change-Id: I0b8ef2563058d1204c790cacdad5a58368da2aac