Plug some leaks