Memory Leaks Fixed