Few changes...

Change-Id: I6a104516ae03c2520dcdc1450e2320166441d4fb