More alloc/dealloc fixes.