Plug some small leaks