fixes

Change-Id: I8a88e33275be0fd75cce0c4b3dae31d7bb3ac57d