Bug fixes post GC POV