A few fixes to the previous commit.