Tweaks to imports