Repair some messy imports