Some bug fixes

Signed-off-by: jianmingyong <jianming1993@gmail.com>