diff --git a/src/config.ts b/src/config.ts
index ad1680a..ddf13a6 100644
--- a/src/config.ts
+++ b/src/config.ts
@@ -41,7 +41,7 @@ export default {
   fhirServerConfig: {
     auth: {
       // This server's URI
-      resourceServer: env.get('RESOURCE_SERVER').required().asUrlString() + '/'
+      resourceServer: env.get('RESOURCE_SERVER').required() + '/'
       //
       // if you use this strategy, you need to add the corresponding env vars to docker-compose
       //
diff --git a/src/fhir/models.ts b/src/fhir/models.ts
index c5615be..6850d7f 100644
--- a/src/fhir/models.ts
+++ b/src/fhir/models.ts
@@ -27,7 +27,7 @@ export interface MetRequirements extends Document {
   drugName: string;
   stakeholderId: string;
   case_numbers: string[];
-  metRequirementId: string;
+  metRequirementId: any;
 }
 
 export interface RemsCase extends Document {
diff --git a/src/lib/etasu.ts b/src/lib/etasu.ts
index a65f57d..8922b5b 100644
--- a/src/lib/etasu.ts
+++ b/src/lib/etasu.ts
@@ -377,7 +377,7 @@ const createMetRequirementAndUpdateCase = async (
           // _id comparison would not work for some reason
           if (req4?.requirementName === matchedMetReq.requirementName) {
             metReqArray[i].completed = true;
-            req4.completed = true;
+            req4!.completed = true;
             await remsCaseCollection.updateOne(
               { _id: remsRequestToUpdate?._id },
               { $set: { metRequirements: metReqArray } }
diff --git a/src/rems-cds-hooks b/src/rems-cds-hooks
index 0799792..1071035 160000
--- a/src/rems-cds-hooks
+++ b/src/rems-cds-hooks
@@ -1 +1 @@
-Subproject commit 0799792f297000c4fa5fac5a212601ecc5990693
+Subproject commit 1071035ca8b87ac1f8fc3614cab4781c5503cc3b