A couple of small fixes

Signed-off-by: Zhaofeng Li <hello@zhaofeng.li>