Try to deal with memory issues some more