fixed some bugs.

Signed-off-by: shines77 <gz_shines@msn.com>
Merge branch 'next'