diff --git a/src/Squidex.Domain.Apps.Read/State/Orleans/Grains/Implementations/AppStateGrainState_Rules.cs b/src/Squidex.Domain.Apps.Read/State/Orleans/Grains/Implementations/AppStateGrainState_Rules.cs
index fd6eb9690..828676281 100644
--- a/src/Squidex.Domain.Apps.Read/State/Orleans/Grains/Implementations/AppStateGrainState_Rules.cs
+++ b/src/Squidex.Domain.Apps.Read/State/Orleans/Grains/Implementations/AppStateGrainState_Rules.cs
@@ -54,7 +54,9 @@ namespace Squidex.Domain.Apps.Read.State.Orleans.Grains.Implementations
 
         private void UpdateRule(RuleEvent @event, EnvelopeHeaders headers, Action<JsonRuleEntity> updater = null)
         {
-            Rules[@event.RuleId] = Rules[@event.RuleId].Clone().Update(@event, headers, updater);
+            var id = @event.RuleId;
+
+            Rules[id] = Rules[id].Clone().Update(@event, headers, updater);
         }
     }
 }
diff --git a/src/Squidex.Domain.Apps.Read/State/Orleans/Grains/Implementations/AppStateGrainState_Schemas.cs b/src/Squidex.Domain.Apps.Read/State/Orleans/Grains/Implementations/AppStateGrainState_Schemas.cs
index 0b3ad8d5d..1cc9028c8 100644
--- a/src/Squidex.Domain.Apps.Read/State/Orleans/Grains/Implementations/AppStateGrainState_Schemas.cs
+++ b/src/Squidex.Domain.Apps.Read/State/Orleans/Grains/Implementations/AppStateGrainState_Schemas.cs
@@ -151,7 +151,9 @@ namespace Squidex.Domain.Apps.Read.State.Orleans.Grains.Implementations
 
         private void UpdateSchema(SchemaEvent @event, EnvelopeHeaders headers, Action<JsonSchemaEntity> updater = null)
         {
-            Schemas[@event.SchemaId.Id].Clone().Update(@event, headers, updater);
+            var id = @event.SchemaId.Id;
+
+            Schemas[id] = Schemas[id].Clone().Update(@event, headers, updater);
         }
     }
 }
diff --git a/src/Squidex/app/framework/angular/animations.ts b/src/Squidex/app/framework/angular/animations.ts
index df32c33b1..2c09d93af 100644
--- a/src/Squidex/app/framework/angular/animations.ts
+++ b/src/Squidex/app/framework/angular/animations.ts
@@ -81,7 +81,7 @@ export function buildFadeAnimation(name = 'fade', timing = '150ms'): AnimationEn
             transition('0 => 1', animate(timing))
         ]
     );
-};
+}
 
 export function buildHeightAnimation(name = 'height', timing = '200ms'): AnimationEntryMetadata {
     return trigger(
@@ -104,7 +104,7 @@ export function buildHeightAnimation(name = 'height', timing = '200ms'): Animati
             transition('0 => 1', animate(timing))
         ]
     );
-};
+}
 
 export const fadeAnimation = buildFadeAnimation();
 export const heightAnimation = buildHeightAnimation();
diff --git a/src/Squidex/app/framework/angular/file-drop.directive.ts b/src/Squidex/app/framework/angular/file-drop.directive.ts
index 15dd6c1a9..2539eb52e 100644
--- a/src/Squidex/app/framework/angular/file-drop.directive.ts
+++ b/src/Squidex/app/framework/angular/file-drop.directive.ts
@@ -100,7 +100,7 @@ export class FileDropDirective {
 
 function isFunction(obj: any): boolean {
     return !!(obj && obj.constructor && obj.call && obj.apply);
-};
+}
 
 interface DragDropEvent extends MouseEvent {
     readonly dataTransfer: DataTransfer;
diff --git a/src/Squidex/app/framework/services/analytics.service.ts b/src/Squidex/app/framework/services/analytics.service.ts
index ba365921b..434577ff1 100644
--- a/src/Squidex/app/framework/services/analytics.service.ts
+++ b/src/Squidex/app/framework/services/analytics.service.ts
@@ -15,7 +15,7 @@ import { ResourceLoaderService } from './resource-loader.service';
 
 export const AnalyticsServiceFactory = (analyticsId: AnalyticsIdConfig, router: Router, resourceLoader: ResourceLoaderService) => {
     return new AnalyticsService(analyticsId, router, resourceLoader);
-}
+};
 
 @Injectable()
 export class AnalyticsService {
diff --git a/src/Squidex/app/framework/services/local-cache.service.ts b/src/Squidex/app/framework/services/local-cache.service.ts
index ba81cc4f5..565115f5a 100644
--- a/src/Squidex/app/framework/services/local-cache.service.ts
+++ b/src/Squidex/app/framework/services/local-cache.service.ts
@@ -7,7 +7,7 @@
 
 import { Injectable } from '@angular/core';
 
-interface Entry { value: any, expires: number };
+interface Entry { value: any; expires: number; }
 
 export const LocalCacheServiceFactory = () => {
     return new LocalCacheService();
diff --git a/src/Squidex/app/framework/utils/types.ts b/src/Squidex/app/framework/utils/types.ts
index d379b159f..e27ed9e87 100644
--- a/src/Squidex/app/framework/utils/types.ts
+++ b/src/Squidex/app/framework/utils/types.ts
@@ -28,7 +28,7 @@ export module Types {
 
     export function isBoolean(value: any): boolean {
         return typeof value === 'boolean';
-    };
+    }
 
     export function isNull(value: any): boolean {
         return value === null;