A few fixes in the last commit.