Some fix according to comments.

Signed-off-by: yangdongsheng <yangds.fnst@cn.fujitsu.com>