fix issues

Change-Id: I00dafdd613ea4005b123b5b9c235aedf15268839