Leaks fixes