more leaflet fixes