Some more leaks

Thomas