Merge "Fix up some small resource issues" into nyc-dev