Small changes missed in first commit.