Fixed missing imports from merge