fixes issues for OSM plugin generated from api cleanup commit