Fixed a few more leaks...