fixes from base
Merge pull request #2344 from mapbox/maintenance

Maintenance