More to be done to fix garbage collection issues