Corrected errors from prev commit.