Plug some more leaks