Fixed bugs. Signed-off-by: Li, Xun <xun.li@intel.com>
Signed-off-by: Zhang Lili Z <lili.z.zhang@intel.com>