fix for duping issue with repairing
fixing some broken imports