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 26a617f6e..a5ef904b3 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
@@ -116,7 +116,7 @@ public class FHIRPathEngine {
 
   private enum Equality { Null, True, False }
 
-  private class FHIRConstant extends Base {
+  private static class FHIRConstant extends Base {
 
     private static final long serialVersionUID = -8933773658248269439L;
     private String value;
@@ -158,7 +158,7 @@ public class FHIRPathEngine {
     }
   }
 
-  private class ClassTypeInfo extends Base {
+  private static class ClassTypeInfo extends Base {
     private static final long serialVersionUID = 4909223114071029317L;
     private Base instance;
 
@@ -1139,7 +1139,7 @@ public class FHIRPathEngine {
     }
   }
 
-  private class ExecutionTypeContext {
+  private static class ExecutionTypeContext {
     private Object appInfo; 
     private String resource;
     private TypeDetails context;
@@ -5909,7 +5909,7 @@ public class FHIRPathEngine {
     return result;
   }
 
-  public class ElementDefinitionMatch {
+  public static class ElementDefinitionMatch {
     private ElementDefinition definition;
     private ElementDefinition sourceDefinition; // if there was a content reference
     private String fixedType;