Attempt to fix both oom and recycled errors