Fix GC upgrades