Merge "Fix a couple static leaks."