diff --git a/backend/src/Squidex.Infrastructure/Orleans/LoggingFilter.cs b/backend/src/Squidex.Infrastructure/Orleans/LoggingFilter.cs
index a36d25361..304e2b0f8 100644
--- a/backend/src/Squidex.Infrastructure/Orleans/LoggingFilter.cs
+++ b/backend/src/Squidex.Infrastructure/Orleans/LoggingFilter.cs
@@ -21,7 +21,7 @@ namespace Squidex.Infrastructure.Orleans
 
         public async Task Invoke(IIncomingGrainCallContext context)
         {
-            var name = $"Grain/{context.ImplementationMethod?.DeclaringType.FullName}/{context.ImplementationMethod?.Name}";
+            var name = $"Grain/{context.ImplementationMethod?.DeclaringType?.FullName}/{context.ImplementationMethod?.Name}";
 
             using (Telemetry.Activities.StartActivity(name))
             {
diff --git a/backend/tests/Squidex.Infrastructure.Tests/Tasks/SchedulerTests.cs b/backend/tests/Squidex.Infrastructure.Tests/Tasks/SchedulerTests.cs
index 799012b45..ebc35e0b9 100644
--- a/backend/tests/Squidex.Infrastructure.Tests/Tasks/SchedulerTests.cs
+++ b/backend/tests/Squidex.Infrastructure.Tests/Tasks/SchedulerTests.cs
@@ -1,9 +1,11 @@
-using System;
+// ==========================================================================
+//  Squidex Headless CMS
+// ==========================================================================
+//  Copyright (c) Squidex UG (haftungsbeschraenkt)
+//  All rights reserved. Licensed under the MIT license.
+// ==========================================================================
+
 using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Xunit;
 
 namespace Squidex.Infrastructure.Tasks
diff --git a/frontend/src/app/features/content/pages/content/editor/content-field.component.html b/frontend/src/app/features/content/pages/content/editor/content-field.component.html
index b5ba0eeff..5e00c3306 100644
--- a/frontend/src/app/features/content/pages/content/editor/content-field.component.html
+++ b/frontend/src/app/features/content/pages/content/editor/content-field.component.html
@@ -23,7 +23,7 @@
             <ng-container *ngIf="showAllControls; else singleControl">
                 <div class="form-group" *ngFor="let language of languages">
                     <sqx-field-editor
-                        [canUnset]="!formModel.field.isDisabled"
+                        [canUnset]="!(isDisabled | async)"
                         [displaySuffix]="prefix(language)"
                         [form]="form"
                         [formContext]="formContext"
@@ -38,7 +38,7 @@
         
             <ng-template #singleControl>
                 <sqx-field-editor
-                    [canUnset]="!formModel.field.isDisabled"
+                    [canUnset]="!(isDisabled | async)"
                     [form]="form"
                     [formContext]="formContext"
                     [formLevel]="formLevel"