Fixes

Change-Id: I7d3e23f18c2b32fcb43a2ec24023bb4871b5043f