diff --git a/followthemoney/schema/Company.yaml b/followthemoney/schema/Company.yaml
index 0adefa206..7137e0d2c 100644
--- a/followthemoney/schema/Company.yaml
+++ b/followthemoney/schema/Company.yaml
@@ -57,10 +57,11 @@ Company:
       label: "MBS"
       type: identifier
     ibcRuc:
-      label: "ibcRUC"
-      type: identifier
       # TODO: Remove this. It's a column name in the ICIJ-released OffshoreLeaks datasets
       # but seems to just mean "company number".
+      deprecated: true
+      label: "ibcRUC"
+      type: identifier
     caemCode:
       label: "COD CAEM"
       description: "(RO) What kind of activity a legal entity is allowed to develop"
diff --git a/followthemoney/schema/LegalEntity.yaml b/followthemoney/schema/LegalEntity.yaml
index 87991d0c3..8738ac53a 100644
--- a/followthemoney/schema/LegalEntity.yaml
+++ b/followthemoney/schema/LegalEntity.yaml
@@ -153,6 +153,8 @@ LegalEntity:
       format: bic
       maxLength: 16
     parent:
+      # Use `Ownership` link instead.
+      deprecated: true
       label: "Parent company"
       description: "If this entity is a subsidiary, another entity (company or organisation) is its parent"
       reverse:
diff --git a/followthemoney/schema/Ownership.yaml b/followthemoney/schema/Ownership.yaml
index 839816df4..951dc56ea 100644
--- a/followthemoney/schema/Ownership.yaml
+++ b/followthemoney/schema/Ownership.yaml
@@ -49,3 +49,4 @@ Ownership:
       label: "Legal basis"
     ownershipType:
       label: "Type of ownership"
+      # e.g. "beneficial", "direct", "indirect", "ultimate"
diff --git a/followthemoney/schema/Security.yaml b/followthemoney/schema/Security.yaml
index 8b7e6bb64..730b276d6 100644
--- a/followthemoney/schema/Security.yaml
+++ b/followthemoney/schema/Security.yaml
@@ -41,6 +41,7 @@ Security:
       label: "Issuer"
       type: entity
       range: LegalEntity
+      # FIXME: Should this be `Organization`?
       reverse:
         label: "Issued securities"
         name: securities
diff --git a/followthemoney/schema/Vehicle.yaml b/followthemoney/schema/Vehicle.yaml
index aeaac3cf8..3c5ec8048 100644
--- a/followthemoney/schema/Vehicle.yaml
+++ b/followthemoney/schema/Vehicle.yaml
@@ -28,6 +28,8 @@ Vehicle:
     model:
       label: Model
     owner:
+      # Use `Ownership` link instead.
+      deprecated: true
       label: Owner
       type: entity
       range: LegalEntity
diff --git a/followthemoney/schema/Vessel.yaml b/followthemoney/schema/Vessel.yaml
index c65deea0c..83c684839 100644
--- a/followthemoney/schema/Vessel.yaml
+++ b/followthemoney/schema/Vessel.yaml
@@ -34,6 +34,7 @@ Vessel:
       label: Navigation Area
     tonnage:
       label: Tonnage
+      type: number
     grossRegisteredTonnage:
       label: Gross Registered Tonnage
       type: number
diff --git a/js/src/defaultModel.json b/js/src/defaultModel.json
index 777887078..05db8007c 100644
--- a/js/src/defaultModel.json
+++ b/js/src/defaultModel.json
@@ -1159,6 +1159,7 @@
           "type": "string"
         },
         "ibcRuc": {
+          "deprecated": true,
           "label": "ibcRUC",
           "matchable": true,
           "maxLength": 64,
@@ -3702,6 +3703,7 @@
           "type": "entity"
         },
         "parent": {
+          "deprecated": true,
           "description": "If this entity is a subsidiary, another entity (company or organisation) is its parent",
           "label": "Parent company",
           "matchable": true,
@@ -6878,6 +6880,7 @@
           "type": "entity"
         },
         "owner": {
+          "deprecated": true,
           "label": "Owner",
           "matchable": true,
           "maxLength": 200,
@@ -7044,10 +7047,10 @@
         },
         "tonnage": {
           "label": "Tonnage",
-          "maxLength": 1024,
+          "maxLength": 250,
           "name": "tonnage",
           "qname": "Vessel:tonnage",
-          "type": "string"
+          "type": "number"
         }
       },
       "required": [