diff --git a/src/module/actor/actor.ts b/src/module/actor/actor.ts
index 2192cf8e..9ed12857 100644
--- a/src/module/actor/actor.ts
+++ b/src/module/actor/actor.ts
@@ -27,7 +27,7 @@ export class DS4Actor extends Actor {
     prepareData(): void {
         this.data.reset();
         this.prepareBaseData();
-        this.prepareEmbeddedEntities();
+        this.prepareEmbeddedDocuments();
         this.applyActiveEffectsToBaseData();
         this.prepareDerivedData();
         this.applyActiveEffectsToDerivedData();
@@ -57,7 +57,7 @@ export class DS4Actor extends Actor {
     /**
      * @override
      * We override this with an empty implementation because we have our own custom way of applying
-     * {@link ActiveEffect}s and {@link Actor#prepareEmbeddedEntities} calls this.
+     * {@link ActiveEffect}s and {@link Actor#prepareEmbeddedDocuments} calls this.
      */
     applyActiveEffects(): void {
         return;
diff --git a/src/system.json b/src/system.json
index fe3dc853..9353231f 100644
--- a/src/system.json
+++ b/src/system.json
@@ -34,7 +34,7 @@
     "changelog": "https://git.f3l.de/dungeonslayers/ds4/-/releases/1.11.1",
     "version": "1.11.1",
     "minimumCoreVersion": "9.238",
-    "compatibleCoreVersion": "9.238",
+    "compatibleCoreVersion": "9",
     "esmodules": ["module/ds4.js"],
     "styles": ["css/ds4.css"],
     "languages": [
@@ -56,7 +56,7 @@
             "system": "ds4",
             "module": "ds4",
             "path": "./packs/special-creature-abilities.db",
-            "entity": "Item"
+            "type": "Item"
         },
         {
             "name": "languages-and-scripts",
@@ -64,7 +64,7 @@
             "system": "ds4",
             "module": "ds4",
             "path": "./packs/languages-and-scripts.db",
-            "entity": "Item"
+            "type": "Item"
         },
         {
             "name": "equipment",
@@ -72,7 +72,7 @@
             "system": "ds4",
             "module": "ds4",
             "path": "./packs/items.db",
-            "entity": "Item"
+            "type": "Item"
         },
         {
             "name": "spells",
@@ -80,7 +80,7 @@
             "system": "ds4",
             "module": "ds4",
             "path": "./packs/spells.db",
-            "entity": "Item"
+            "type": "Item"
         },
         {
             "name": "creatures",
@@ -88,7 +88,7 @@
             "system": "ds4",
             "module": "ds4",
             "path": "./packs/creatures.db",
-            "entity": "Actor"
+            "type": "Actor"
         },
         {
             "name": "racial-abilities",
@@ -96,7 +96,7 @@
             "system": "ds4",
             "module": "ds4",
             "path": "./packs/racial-abilities.db",
-            "entity": "Item"
+            "type": "Item"
         }
     ],
     "manifest": "https://git.f3l.de/api/v4/projects/dungeonslayers%2Fds4/packages/generic/ds4/latest/system.json",
diff --git a/src/templates/sheets/item/tabs/description.hbs b/src/templates/sheets/item/tabs/description.hbs
index 39b2107b..85754d52 100644
--- a/src/templates/sheets/item/tabs/description.hbs
+++ b/src/templates/sheets/item/tabs/description.hbs
@@ -21,7 +21,7 @@ Additional elements of the side-properties div can be handed over via the @parti
         {{/if}}
         <div class="side-property">
             <label for="data.actor">{{localize 'DS4.ItemOwner'}}</label>
-            <a class="entity-link" draggable="true" data-entity="Actor" data-id="{{actor.id}}"><i
+            <a class="content-link entity-link" draggable="true" data-type="Actor" data-entity="Actor" data-id="{{actor.id}}"><i
                     class="fas fa-user"></i>{{actor.name}}</a>
         </div>
         {{#if isPhysical}}