Fixed a bunch of GC issues.  Still have more to fix.