OSM improvements