Few more memory leaks fixed