Some minor fixes and building leaflet at the end :shipit: