More tweaks to legacy import