Fixing GC and DDFS