fixes

Change-Id: Iae050603f59801ee3678c254aa985857d0c84173