More Memory Leak Fixes