Fix GC issues