<init> fixes in components (simplify)