Fix missing references with garbage collector