Some missing changes for the previous commit.