Some more Fixes

Change-Id: I08f59c54ef85c47626c335d8f281896e5e38514f