Fixes

Change-Id: Iba254af1c19ce205f134ab698b2e76034da5e0ae