Fix breakage from Gc's demise