Fixed some oversights in previous commit.