Should have fixed some more leaks