Fixes to the previous commit.