Some minor changes to avoid a problem caused by osm2pgsql.