Fix compiler warnings
Fixing yet more leaks