Some changes too

Change-Id: I1714ab10d184c346d66830a2071341c607b46c89