A few quick fixes to work with Maxim's gazetteer