Fix broken imports