diff --git a/json_schema/death.json b/json_schema/death.json
index 38cb12eb0..6e77ef120 100644
--- a/json_schema/death.json
+++ b/json_schema/death.json
@@ -31,8 +31,7 @@
         }
     },
     "required": [
-        "cause_of_death",
-        "time_of_death"
+        "cause_of_death"
     ],
     "title": "death",
     "type": "object"
diff --git a/json_schema/donor.json b/json_schema/donor.json
index 3aee8af61..049dea82d 100644
--- a/json_schema/donor.json
+++ b/json_schema/donor.json
@@ -5,9 +5,8 @@
     "properties": {
         "age": {
             "description": "Age in age_units. For embryos, measured since fertilization. For all others, measured since birth.",
-            "maximum": 150,
-            "minimum": 0,
-            "type": "number"
+            "pattern": "^[0-9]+\\.?[0-9]*-?[0-9]*\\.?[0-9]*$",
+            "type": "string"
         },
         "age_unit": {
             "description": "The unit in which age is expressed. Must be one of day, week, month, or year.",
@@ -15,7 +14,11 @@
                 "hour",
                 "day",
                 "week",
-                "year"
+                "year",
+                "hours",
+                "days",
+                "weeks",
+                "years"
             ]
         },
         "alcohol_history": {
@@ -55,10 +58,9 @@
             "type": "string"
         },
         "height": {
-            "description": "Height of donor in meters.",
-            "maximum": 10,
-            "minimum": 0,
-            "type": "number"
+            "description": "Height of donor, in meters. Can be a range separated by a hyphen.",
+            "pattern": "^[0-9]+\\.?[0-9]*-?[0-9]*\\.?[0-9]*$",
+            "type": "string"
         },
         "is_living": {
             "description": "Should be yes if donor is living at time of sample donation. Otherwise, should be no.",
@@ -109,10 +111,9 @@
             }
         },
         "weight": {
-            "description": "Weight of donor in kilograms.",
-            "maximum": 1000,
-            "minimum": 0,
-            "type": "number"
+            "description": "Weight of donor, in kilograms. Can be a range separated by a hyphen.",
+            "pattern": "^[0-9]+\\.?[0-9]*-?[0-9]*\\.?[0-9]*$",
+            "type": "string"
         }
     },
     "required": [