Tweaks to import / export tool