More import tweaks