Location import fixes

Handful of small fixes to the location importer.