修复bug若干

Signed-off-by: boddmg <boddmg@gmail.com>