More import fixing