More Heap Fixes

Even more heap fixes. Strings really are complicated...