More changes to help with "Out of Memory" errors