Tweaks to import and messaging