Added missing stuff from last commit.