some other changes

Change-Id: I3d76e224232b56147f27f1ddb834c1654b8be524