diff --git a/libs/components/src/breadcrumbs/breadcrumb.component.ts b/libs/components/src/breadcrumbs/breadcrumb.component.ts
index 9c6d8146672..54678f3e4ee 100644
--- a/libs/components/src/breadcrumbs/breadcrumb.component.ts
+++ b/libs/components/src/breadcrumbs/breadcrumb.component.ts
@@ -11,11 +11,11 @@ import { QueryParamsHandling } from "@angular/router";
 export class BreadcrumbComponent {
   readonly icon = input<string>();
 
-  readonly route = input<string | any[]>(undefined);
+  readonly route = input<string | any[]>();
 
   readonly queryParams = input<Record<string, string>>({});
 
-  readonly queryParamsHandling = input<QueryParamsHandling>(undefined);
+  readonly queryParamsHandling = input<QueryParamsHandling>();
 
   @Output()
   click = new EventEmitter();
diff --git a/libs/components/src/icon/icon.component.ts b/libs/components/src/icon/icon.component.ts
index dc3710921a4..ec25ad30d56 100644
--- a/libs/components/src/icon/icon.component.ts
+++ b/libs/components/src/icon/icon.component.ts
@@ -17,7 +17,7 @@ export class BitIconComponent {
 
   readonly icon = input<Icon>();
 
-  readonly ariaLabel = input<string | undefined>(undefined);
+  readonly ariaLabel = input<string>();
 
   constructor(private domSanitizer: DomSanitizer) {
     effect(() => {
diff --git a/libs/components/src/input/input.directive.ts b/libs/components/src/input/input.directive.ts
index 2e9b002e118..8e7570c419a 100644
--- a/libs/components/src/input/input.directive.ts
+++ b/libs/components/src/input/input.directive.ts
@@ -72,7 +72,7 @@ export class BitInputDirective implements BitFormFieldControl {
 
   spellcheck = model<boolean>();
 
-  // TODO: Skipped for migration because:
+  // TODO: Skipped for signal migration because:
   //  Accessor inputs cannot be migrated as they are too complex.
   @HostBinding()
   @Input()
diff --git a/libs/components/src/select/select.component.ts b/libs/components/src/select/select.component.ts
index f0c707f3b36..8d31edcfd8f 100644
--- a/libs/components/src/select/select.component.ts
+++ b/libs/components/src/select/select.component.ts
@@ -78,11 +78,11 @@ export class SelectComponent<T> implements BitFormFieldControl, ControlValueAcce
       return;
     }
     this.items.set(
-      value.toArray().map((c) => ({
-        icon: c.icon(),
-        value: c.value(),
-        label: c.label(),
-        disabled: c.disabled(),
+      value.toArray().map((option) => ({
+        icon: option.icon(),
+        value: option.value(),
+        label: option.label(),
+        disabled: option.disabled(),
       })),
     );
   }
@@ -165,7 +165,7 @@ export class SelectComponent<T> implements BitFormFieldControl, ControlValueAcce
   readonly id = input(`bit-multi-select-${nextId++}`);
 
   /**Implemented as part of BitFormFieldControl */
-  // TODO: Skipped for migration because:
+  // TODO: Skipped for signal migration because:
   //  Accessor inputs cannot be migrated as they are too complex.
   @HostBinding("attr.required")
   @Input()
diff --git a/libs/components/src/typography/typography.directive.ts b/libs/components/src/typography/typography.directive.ts
index 08084beba5c..76451d3c82f 100644
--- a/libs/components/src/typography/typography.directive.ts
+++ b/libs/components/src/typography/typography.directive.ts
@@ -32,7 +32,7 @@ const margins: Record<TypographyType, string[]> = {
   selector: "[bitTypography]",
 })
 export class TypographyDirective {
-  readonly bitTypography = input<TypographyType>(undefined);
+  readonly bitTypography = input<TypographyType>();
 
   readonly noMargin = input(false, { transform: booleanAttribute });