diff --git a/src/Squidex/app/features/content/pages/content/field-languages.component.ts b/src/Squidex/app/features/content/pages/content/field-languages.component.ts
index d878f1a51..43ea07aec 100644
--- a/src/Squidex/app/features/content/pages/content/field-languages.component.ts
+++ b/src/Squidex/app/features/content/pages/content/field-languages.component.ts
@@ -48,5 +48,5 @@ export class FieldLanguagesComponent {
     public languageChange = new EventEmitter<AppLanguageDto>();
 
     @Output()
-    public showAllControlsChange = new EventEmitter<AppLanguageDto>();
+    public showAllControlsChange = new EventEmitter<boolean>();
 }
\ No newline at end of file
diff --git a/src/Squidex/app/features/schemas/pages/schema/field-wizard.component.html b/src/Squidex/app/features/schemas/pages/schema/field-wizard.component.html
index 99b6d48b8..0a16aea81 100644
--- a/src/Squidex/app/features/schemas/pages/schema/field-wizard.component.html
+++ b/src/Squidex/app/features/schemas/pages/schema/field-wizard.component.html
@@ -94,8 +94,8 @@
         <button type="reset" class="float-left btn btn-secondary" (click)="emitComplete()">Cancel</button>
 
         <div class="float-right" *ngIf="!isEditing">
-            <button type="button" class="btn btn-outline-success mr-1" (click)="addField(false, false)">Create and close</button>
-            <button type="button" class="btn btn-success mr-1" (click)="addField(true, false)">Create and add field</button>
+            <button type="button" class="btn btn-outline-success mr-1" (click)="addField(false)">Create and close</button>
+            <button type="button" class="btn btn-success mr-1" (click)="addField(true)">Create and add field</button>
             <button type="button" class="btn btn-success" (click)="addField(false, true)">Create and edit field</button>
         </div>
 
diff --git a/src/Squidex/app/features/schemas/pages/schema/field-wizard.component.ts b/src/Squidex/app/features/schemas/pages/schema/field-wizard.component.ts
index fb2471233..d341f4af2 100644
--- a/src/Squidex/app/features/schemas/pages/schema/field-wizard.component.ts
+++ b/src/Squidex/app/features/schemas/pages/schema/field-wizard.component.ts
@@ -66,7 +66,7 @@ export class FieldWizardComponent implements OnInit {
         this.complete.emit();
     }
 
-    public addField(addNew: boolean, edit: boolean) {
+    public addField(addNew: boolean, edit = false) {
         const value = this.addFieldForm.submit();
 
         if (value) {
@@ -97,7 +97,7 @@ export class FieldWizardComponent implements OnInit {
         this.selectedTab = tab;
     }
 
-    public save(addNew: boolean) {
+    public save(addNew = false) {
         const value = this.editForm.submit();
 
         if (value) {
diff --git a/src/Squidex/app/features/settings/pages/languages/language.component.html b/src/Squidex/app/features/settings/pages/languages/language.component.html
index dad853c5b..0c8a261c5 100644
--- a/src/Squidex/app/features/settings/pages/languages/language.component.html
+++ b/src/Squidex/app/features/settings/pages/languages/language.component.html
@@ -87,7 +87,7 @@
                 </div>
 
                 <div class="form-group row" *ngIf="!language.isMaster">
-                    <div class="col offset-3 col-9" *ngIf="!isMaster">
+                    <div class="col offset-3 col-9">
                         <div class="form-check">
                             <input class="form-check-input" type="checkbox" id="{{language.iso2Code}}_isOptional" formControlName="isOptional" />
                             <label class="form-check-label" for="{{language.iso2Code}}_isOptional">
diff --git a/src/Squidex/app/framework/angular/forms/stars.component.html b/src/Squidex/app/framework/angular/forms/stars.component.html
index de372853f..c55479e29 100644
--- a/src/Squidex/app/framework/angular/forms/stars.component.html
+++ b/src/Squidex/app/framework/angular/forms/stars.component.html
@@ -4,7 +4,7 @@
             <span class="star" *ngFor="let star of snapshot.starsArray" (mouseenter)="setPreview(star)" (click)="setValue(star)" [class.selected]="star <= snapshot.stars"></span>
         </span>
 
-        <button type="button" class="btn btn-text" [class.hidden]="!value" (click)="reset()">Clear</button>
+        <button type="button" class="btn btn-text" [class.hidden]="!snapshot.value" (click)="reset()">Clear</button>
     </ng-container>
 
     <ng-template #noStars>
diff --git a/src/Squidex/app/shared/components/help-markdown.pipe.ts b/src/Squidex/app/shared/components/help-markdown.pipe.ts
index 8db8182a1..929c0a0dd 100644
--- a/src/Squidex/app/shared/components/help-markdown.pipe.ts
+++ b/src/Squidex/app/shared/components/help-markdown.pipe.ts
@@ -19,7 +19,7 @@ renderer.link = (href, title, text) => {
     pure: true
 })
 export class HelpMarkdownPipe implements PipeTransform {
-    public transform(text: string): string {
+    public transform(text: string | null): string {
         if (text) {
             return Marked(text, { renderer });
         } else {
diff --git a/src/Squidex/app/shared/components/search-form.component.html b/src/Squidex/app/shared/components/search-form.component.html
index b6dbf5f71..11d2cc97a 100644
--- a/src/Squidex/app/shared/components/search-form.component.html
+++ b/src/Squidex/app/shared/components/search-form.component.html
@@ -63,7 +63,7 @@
         </div>
         
         <div class="form-check" *ngIf="enableArchive">
-            <input class="form-check-input" type="checkbox" id="archivedItems" [ngModel]="archived" (ngModelChange)="archivedChanged.emit($event)" />
+            <input class="form-check-input" type="checkbox" id="archivedItems" [ngModel]="archived" (ngModelChange)="archivedChange.emit($event)" />
             <label class="form-check-label" for="archivedItems">
                 Archived items
             </label>
diff --git a/src/Squidex/tsconfig.json b/src/Squidex/tsconfig.json
index 1de085f1f..16e9320a9 100644
--- a/src/Squidex/tsconfig.json
+++ b/src/Squidex/tsconfig.json
@@ -22,6 +22,7 @@
     }
   },
   "angularCompilerOptions": { 
-    "preserveWhitespaces": true 
+    "fullTemplateTypeCheck": true,
+    "strictInjectionParameters": true
   }
 }
\ No newline at end of file