components: Fixup