Some leaks fixed,  others not so much