Some leaks plugged