Memory leaks ctd

12 more to go