Fixed bugs due to latest commit.