Merge "Fix up some small resource issues" into nyc-dev am: e4735a9959
am: 54811ec9bc

* commit '54811ec9bc54886f3bc2bba4091edfc56bd06fdd':
  Fix up some small resource issues