More fixed errors from previous commit.