[Fixed] some issues

Change-Id: I4831754a30a6f5e4ba778f0ffeda15e7a0b41a9f