More Fixes

Change-Id: I04dbccb87ba074c8cc405db2f9b9214724b5a68f