Some small typo and bugfixes

Signed-off-by: Huang Le <4tarhl@gmail.com>