do some fix

Change-Id: If7aff8d0d2644c110d936e523fd79f6dc8ea495d