Fix some leaks
Merge pull request #19 from adneal/plumber

Fix some leaks