More import fixups.