Some more changes from last commit.