misc changes

Change-Id: Ibd4f08df8dfca55b3a3bb8c348dc7240b6c60718