More small fixes.

Signed-off-by: Lee Sheng <lsheng@wibidata.com>