Fix crazy import/migration order thing