Some problems solved.

Signed-off-by: Luke.Xuan <aoser97@gmail.com>