fixes

Change-Id: Ia7d2642a5881e21fc97744be5193f71ee7f62ad5