Few changes...

Change-Id: Ic697fb87ea75df8cd31e582cab212b641c670159