修复若干小问题

Signed-off-by: Meathill <meathill@gmail.com>