Attempt to fix some GC issues