Fix few more leaks