Fixes fixes everywhere part4??? xD

Change-Id: I54889002230a3821241d8b82e289709083e305af