diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/conformance/ProfileUtilities.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/conformance/ProfileUtilities.java
index 8bbb1f519..d04e3909f 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/conformance/ProfileUtilities.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/conformance/ProfileUtilities.java
@@ -2922,7 +2922,10 @@ public class ProfileUtilities extends TranslatingUtilities {
         
       } else {
         StructureDefinition sd = context.fetchTypeDefinition(t);
-        if (sd.getKind() == StructureDefinitionKind.PRIMITIVETYPE) {
+        if (sd == null) {
+          System.out.println("Unable to find "+t);
+          sd = context.fetchTypeDefinition(t);
+        } else if (sd.getKind() == StructureDefinitionKind.PRIMITIVETYPE) {
           choicerow.getCells().add(gen.new Cell(null, null, tail(element.getPath()).replace("[x]",  Utilities.capitalize(t)), sd.getDescription(), null));
           choicerow.getCells().add(gen.new Cell());
           choicerow.getCells().add(gen.new Cell(null, null, "", null, null));
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/context/BaseWorkerContext.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/context/BaseWorkerContext.java
index 61679e4f8..adc4eaeb0 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/context/BaseWorkerContext.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/context/BaseWorkerContext.java
@@ -124,18 +124,18 @@ public abstract class BaseWorkerContext implements IWorkerContext {
   
   private Map<String, Map<String, Resource>> allResourcesById = new HashMap<String, Map<String, Resource>>();
   // all maps are to the full URI
-  private MetadataResourceManager<CodeSystem> codeSystems = new MetadataResourceManager<CodeSystem>();
+  private MetadataResourceManager<CodeSystem> codeSystems = new MetadataResourceManager<CodeSystem>(false);
   private Set<String> supportedCodeSystems = new HashSet<String>();
-  private MetadataResourceManager<ValueSet> valueSets = new MetadataResourceManager<ValueSet>();
-  private MetadataResourceManager<ConceptMap> maps = new MetadataResourceManager<ConceptMap>();
-  protected MetadataResourceManager<StructureMap> transforms = new MetadataResourceManager<StructureMap>();
-  private MetadataResourceManager<StructureDefinition> structures = new MetadataResourceManager<StructureDefinition>();
-  private MetadataResourceManager<ImplementationGuide> guides = new MetadataResourceManager<ImplementationGuide>();
-  private MetadataResourceManager<CapabilityStatement> capstmts = new MetadataResourceManager<CapabilityStatement>();
-  private MetadataResourceManager<SearchParameter> searchParameters = new MetadataResourceManager<SearchParameter>();
-  private MetadataResourceManager<Questionnaire> questionnaires = new MetadataResourceManager<Questionnaire>();
-  private MetadataResourceManager<OperationDefinition> operations = new MetadataResourceManager<OperationDefinition>();
-  private MetadataResourceManager<PlanDefinition> plans = new MetadataResourceManager<PlanDefinition>();
+  private MetadataResourceManager<ValueSet> valueSets = new MetadataResourceManager<ValueSet>(false);
+  private MetadataResourceManager<ConceptMap> maps = new MetadataResourceManager<ConceptMap>(false);
+  protected MetadataResourceManager<StructureMap> transforms = new MetadataResourceManager<StructureMap>(false);
+  private MetadataResourceManager<StructureDefinition> structures = new MetadataResourceManager<StructureDefinition>(false);
+  private MetadataResourceManager<ImplementationGuide> guides = new MetadataResourceManager<ImplementationGuide>(false);
+  private MetadataResourceManager<CapabilityStatement> capstmts = new MetadataResourceManager<CapabilityStatement>(false);
+  private MetadataResourceManager<SearchParameter> searchParameters = new MetadataResourceManager<SearchParameter>(false);
+  private MetadataResourceManager<Questionnaire> questionnaires = new MetadataResourceManager<Questionnaire>(false);
+  private MetadataResourceManager<OperationDefinition> operations = new MetadataResourceManager<OperationDefinition>(false);
+  private MetadataResourceManager<PlanDefinition> plans = new MetadataResourceManager<PlanDefinition>(false);
   private List<NamingSystem> systems = new ArrayList<NamingSystem>();
   private UcumService ucumService;
   
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/context/MetadataResourceManager.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/context/MetadataResourceManager.java
index 75a04ea07..1b9f159e8 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/context/MetadataResourceManager.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/context/MetadataResourceManager.java
@@ -48,9 +48,16 @@ public class MetadataResourceManager<T extends MetadataResource> {
   }
 
 
+  private boolean enforceUniqueId; 
   private List<T> list = new ArrayList<>();
   private Map<String, T> map = new HashMap<>();
   
+  
+  public MetadataResourceManager(boolean enforceUniqueId) {
+    super();
+    this.enforceUniqueId = enforceUniqueId;
+  }
+
   public void copy(MetadataResourceManager<T> source) {
     list.clear();
     map.clear();
@@ -62,7 +69,7 @@ public class MetadataResourceManager<T extends MetadataResource> {
     if (!r.hasId()) {
       r.setId(UUID.randomUUID().toString());
     }
-    if (map.containsKey(r.getId())) {
+    if (enforceUniqueId && map.containsKey(r.getId())) {
       drop(r.getId());      
     }
     list.add(r);
@@ -98,7 +105,9 @@ public class MetadataResourceManager<T extends MetadataResource> {
           }
         }
         if (latest != null) { // might be null if it's not using semver
-          map.put(url+"|"+VersionUtilities.getMajMin(latest.getVersion()), rl.get(rl.size()-1));
+          String lv = VersionUtilities.getMajMin(latest.getVersion());
+          if (lv != null && !lv.equals(version))
+            map.put(url+"|"+lv, rl.get(rl.size()-1));
         }
       }
     }
@@ -176,5 +185,9 @@ public class MetadataResourceManager<T extends MetadataResource> {
   public Set<String> keys() {
     return map.keySet();
   }
+
+  public boolean isEnforceUniqueId() {
+    return enforceUniqueId;
+  }
   
 }
diff --git a/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/MetadataResourceManagerTester.java b/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/MetadataResourceManagerTester.java
index c9ff93b1a..f7939ab8f 100644
--- a/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/MetadataResourceManagerTester.java
+++ b/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/MetadataResourceManagerTester.java
@@ -10,7 +10,7 @@ import org.junit.Test;
 
 public class MetadataResourceManagerTester {
 
-  private MetadataResourceManager<ValueSet> mrm = new MetadataResourceManager<>();
+  private MetadataResourceManager<ValueSet> mrm = new MetadataResourceManager<>(true);
   
   @Test
   public void testSingleNoVersion() {
diff --git a/pom.xml b/pom.xml
index c35c522e8..e85dfdcf0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
     each other. It is fine to bump the point version of this POM without affecting
     HAPI FHIR.
     -->
-    <version>4.1.1</version>
+    <version>4.1.1-SNAPSHOT</version>
 
     <properties>
         <hapi_fhir_version>4.1.0</hapi_fhir_version>
diff --git a/release.bat b/release.bat
index 8305afa22..a247c036e 100644
--- a/release.bat
+++ b/release.bat
@@ -1,7 +1,7 @@
 @echo off
 
-set oldver=4.0.35
-set newver=4.0.36
+set oldver=4.1.1
+set newver=4.1.2
 
 echo ..
 echo =====================================================================