More updates.

Signed-off-by: Jerry Tian <tianjerry@gmail.com>