Fixes top-level import code