Fixed more memory leaks! :D