Additional Fixes

Change-Id: I81e8e35680f064449ab8002c42beacd7064fb0ac