Fixes

Change-Id: Iaecba29cb5958787ec2581198943d373e37a3934