Additional leaks fixed