some fixed

Change-Id: If8eb99f28f4c5cad4c30b04c1fda6d5ccb0eb8c9