Fix some GC issues