Various changes

Change-Id: I9579773ec000cb4aa748a3dc0b3b05f9e447fab4