Fix some bugs

Signed-off-by: Takashiro <takashiro@qq.com>