GC fixes and GC locations func updated

GC fixes and GC locations func updated