Fix broken imports in other packages