Fixes for GC
Merged Isaac's changes