Version2, Fix some bugs;

Change-Id: Ie5ba12f3111b3deb4d8720525e0ee2795d5d760d