misc fixes

Change-Id: Iaa9d7ed769680676ee9c92d18985386740ed2e51