A few more leak fixes

Some minor tidy up with it.