Fix some Memory Leak