Fix a few nominatim issues.