!fixup Minor corrections of the previous commit.