Add some changes that were omitted in the previous commit.