More nit fixes

Change-Id: I7a20dd7133ea2402c7aa1c2438d1978948d97a1c