Fixing Leaks

Coming soon …