Fix some bugs for previous commit.