Final fixes

Signed-off-by: Yu Mingfei <yumingfei@cn.fujitsu.com>