Few leftover changes in the previous commit.