Repair some import errors.