Small fixes in the last commit.