Fixed some more gc issues.