Fix few more memory leaks