修复若干问题

Change-Id: I10b434d00bdd91c3ddf30565688d63a33d9aae1d