Fix missing imports from merge