Leaks Fixed