Got rid of some memory errors (still more).