No reviewer needed - Fix up leaks

Related to pull request #242.