Add changes from osm_hello