Fix superClass linking and isolates.