Merge "Fix leaks" into nyc-dev