Fixes

Change-Id: Ibdcc35b9f9dacaeb45f5c6d521497ba1adf85caf