Bug fixes against Mapbox GL