fix some bugs

Signed-off-by: Zhiping Yang <XcodeYang@Gmail.com>