More Fixes

Change-Id: I49c15faea124510427193cc9a13c24fdcb254087