Fixes to the last commit.