More fixes in leaflet control