修掉一些潜在问题

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