部分bug修复

Signed-off-by: weilichuang <weilichuang@gmail.com>