Trying to fix up memory issues.