Fix a little amount of the leaks