Some more leaks fixed.