Slight tweaks to database importer.