more tweaks to attempt to fix legacy imports