Some minor fixes to complete the previous commit.