Possibly corrected some memory issues.