diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/analytics/PackageVisitor.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/analytics/PackageVisitor.java
index 9036ce044..2ae51713b 100644
--- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/analytics/PackageVisitor.java
+++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/analytics/PackageVisitor.java
@@ -284,6 +284,7 @@ public class PackageVisitor {
   private boolean corePackage(NpmPackage npm) {
     return npm != null && !Utilities.noString(npm.name()) && (
         npm.name().startsWith("hl7.terminology") || 
+        npm.name().startsWith("hl7.fhir.core") || 
         npm.name().startsWith("hl7.fhir.r2.") || 
         npm.name().startsWith("hl7.fhir.r2b.") || 
         npm.name().startsWith("hl7.fhir.r3.") || 
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 beec3d432..73f8905a3 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
@@ -3979,7 +3979,7 @@ public class ProfileUtilities extends TranslatingUtilities {
       tracker.used = !max.getValue().equals("0");
 
     String hint = null;
-    if ("*".equals(max.getValue()) && 0 == min.getValue()) {
+    if (max.hasValue() && min.hasValue() && "*".equals(max.getValue()) && 0 == min.getValue()) {
       if (definition.hasExtension(ToolingExtensions.EXT_JSON_EMPTY)) {
         String code = ToolingExtensions.readStringExtension(definition, ToolingExtensions.EXT_JSON_EMPTY);
         if ("present".equals(code)) {