Fix bugs for last commit.