Fix GC refactoring bugs