plug some leaks