Some more changes missed in last commit.