Misc user/location importer fixes

Probably best to look at commits individually, all pretty small stuff though.