diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/FHIRPathEngine.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/FHIRPathEngine.java
index 2fc96a9a7..1239685a8 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/FHIRPathEngine.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/FHIRPathEngine.java
@@ -2367,7 +2367,7 @@ public class FHIRPathEngine {
 	  if (vs != null) {
 	    for (Base l : left) {
 	      if (Utilities.existsInList(l.fhirType(), "code", "string", "uri")) {
-          if (worker.validateCode(terminologyServiceOptions.guessSystem(), TypeConvertor.castToCoding(l), vs).isOk()) {
+          if (worker.validateCode(terminologyServiceOptions.guessSystem() , TypeConvertor.castToCoding(l), vs).isOk()) {
             ans = true;
           }
 	      } else if (l.fhirType().equals("Coding")) {
@@ -5734,4 +5734,4 @@ public class FHIRPathEngine {
   }
   
   
-}
\ No newline at end of file
+}
diff --git a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/VersionUtilities.java b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/VersionUtilities.java
index 0f73b40a5..80042df27 100644
--- a/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/VersionUtilities.java
+++ b/org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/VersionUtilities.java
@@ -75,6 +75,10 @@ public class VersionUtilities {
     if (isR4BVer(v)) {
       return "hl7.fhir.r4b.core";
     }
+
+    if (isR5Ver(v)) {
+      return "hl7.fhir.r5.core";
+    }
     
     if ("current".equals(v)) {
       return "hl7.fhir.r5.core";
@@ -101,6 +105,9 @@ public class VersionUtilities {
     if (isR4Ver(v)) {
       return "4.0.1";
     }
+    if (isR5Ver(v)) {
+      return "5.0.0";
+    }
     if (v != null && v.startsWith(CURRENT_VERSION)) {
       return "current";
     }