Fixed some bugs in prev release.