Minor fixes

Signed-off-by: Lance Chen <cyen0312@gmail.com>