Fixes

Last Fixes to remove one commit

Change-Id: I1d1da1658b4a8ae2f4d14ee4ec7c6d2c5b5671c0