misc changes

Change-Id: I280b6a64fd9ab119db40e51b5ec3dba268214ac0