Some Fixes

Change-Id: I3b105e3fcebe575bb79c6cc1747e4938cbafe2c4