Fix up a few things of previous commit.