Fix bugs and commit.