Fix nyc stuff