tweaks

Change-Id: I235a77276371c6755550d9a390fef016ff1497de