several changes

Change-Id: I207dba7ce8137004689477745dc4cd65c46a5c10