Add some resilience and options to force OSM import and sync