More leaks fixed