Bugs fixed for 5.2.2.

5.2.2a, fix some bugs..