Small fixes for leaflet>=0.8-dev