Added missing stuff from previous commit.