Fixing Some Leaks