Fix up existing components