Tweak imports