diff --git a/packages/angular/projects/cds-angular/_stubs/directive.ts.mustache b/packages/angular/projects/cds-angular/_stubs/directive.ts.mustache
index 884f3fec2..3aa768474 100644
--- a/packages/angular/projects/cds-angular/_stubs/directive.ts.mustache
+++ b/packages/angular/projects/cds-angular/_stubs/directive.ts.mustache
@@ -4,7 +4,7 @@
  * The full license information can be found in LICENSE in the root directory of this project.
  */
 
-import { Directive, ElementRef, {{#hasProps}} Input {{/hasProps}} {{#hasEvents}}, Output, EventEmitter {{/hasEvents}} } from '@angular/core';
+import { Directive, ElementRef {{#hasProps}}, Input {{/hasProps}} {{#hasEvents}}, Output, EventEmitter {{/hasEvents}} } from '@angular/core';
 import { {{elementClassName}} } from '@cds/core/{{{directiveModule}}}';
 
 @Directive({ selector: '{{tagName}}' })
diff --git a/packages/core/src/card/card.element.ts b/packages/core/src/card/card.element.ts
index bc218f783..ca18bffe3 100644
--- a/packages/core/src/card/card.element.ts
+++ b/packages/core/src/card/card.element.ts
@@ -49,7 +49,7 @@ import styles from './card.element.scss';
  * @cssprop --cds-card-remove-margin
  */
 export class CdsCard extends CdsInternalPanel {
-  @globalStyle() globalStyles = css`
+  @globalStyle() protected globalStyles = css`
     [cds-card-remove-margin] {
       margin-left: calc(-1 * var(--card-remove-margin));
       width: calc(100% + calc(var(--card-remove-margin) * 2));
diff --git a/scripts/core-ng-module-generator.js b/scripts/core-ng-module-generator.js
index f80bbd083..1f9509663 100644
--- a/scripts/core-ng-module-generator.js
+++ b/scripts/core-ng-module-generator.js
@@ -129,7 +129,7 @@ function getDirectiveProps(props) {
     .filter(prop => prop.privacy === undefined) // public
     .filter(prop => !prop.static)
     .filter(prop => !prop.readonly)
-    .filter(prop => prop.type && prop.type.text && !prop.type.text.includes('EventEmitter')) // exclude events
+    .filter(prop => !prop.type?.text?.includes('EventEmitter')) // exclude events
     .map(prop => ({ name: prop.name, isBoolean: prop?.type?.text === 'boolean' }));
 }