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 25106f617..f058b3e50 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
@@ -2703,7 +2703,7 @@ public class ProfileUtilities extends TranslatingUtilities {
             if (binding.hasExtension(ToolingExtensions.EXT_MIN_VALUESET)) {
               br = pkp.resolveBinding(profile, ToolingExtensions.readStringExtension(binding, ToolingExtensions.EXT_MIN_VALUESET), definition.getPath());
               c.addPiece(gen.new Piece("br"));
-              c.getPieces().add(checkForNoChange(binding, gen.new Piece(corePath+"extension-elementdefinition-minvalueset.html", translate("sd.table", "Mon Binding")+": ", "Min Value Set Extension").addStyle("font-weight:bold")));             
+              c.getPieces().add(checkForNoChange(binding, gen.new Piece(corePath+"extension-elementdefinition-minvalueset.html", translate("sd.table", "Min Binding")+": ", "Min Value Set Extension").addStyle("font-weight:bold")));             
               c.getPieces().add(checkForNoChange(binding, gen.new Piece(br.url == null ? null : Utilities.isAbsoluteUrl(br.url) || !pkp.prependLinks() ? br.url : corePath+br.url, br.display, null)));
             }
           }
diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/NarrativeGenerator.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/NarrativeGenerator.java
index bd9637485..2a7758af5 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/NarrativeGenerator.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/NarrativeGenerator.java
@@ -1392,9 +1392,10 @@ public class NarrativeGenerator implements INarrativeGenerator {
       return;
     else if (e instanceof InstantType)
       x.addText(((InstantType) e).toHumanDisplay());
-    else if (e instanceof DateTimeType)
-      x.addText(((DateTimeType) e).toHumanDisplay());
-    else if (e instanceof Base64BinaryType)
+    else if (e instanceof DateTimeType) {
+      if (e.hasPrimitiveValue())
+        x.addText(((DateTimeType) e).toHumanDisplay());
+    } else if (e instanceof Base64BinaryType)
       x.addText(new Base64().encodeAsString(((Base64BinaryType) e).getValue()));
     else if (e instanceof org.hl7.fhir.r5.model.DateType)
       x.addText(((org.hl7.fhir.r5.model.DateType) e).toHumanDisplay());
diff --git a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/r5/validation/InstanceValidator.java b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/r5/validation/InstanceValidator.java
index b6fdc95d1..d74115fdd 100644
--- a/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/r5/validation/InstanceValidator.java
+++ b/org.hl7.fhir.validation/src/main/java/org/hl7/fhir/r5/validation/InstanceValidator.java
@@ -2150,7 +2150,8 @@ public class InstanceValidator extends BaseValidator implements IResourceValidat
       }
     }
 
-    warning(errors, IssueType.REQUIRED, -1, -1, path, match!=null || !targetUrl.startsWith("urn"), "URN reference is not locally contained within the bundle " + ref);
+    if (match == null)
+      warning(errors, IssueType.REQUIRED, -1, -1, path, !ref.startsWith("urn"), "URN reference is not locally contained within the bundle " + ref);
     return match;
   }
 
@@ -2972,12 +2973,9 @@ private boolean isAnswerRequirementFulfilled(QuestionnaireItemComponent qItem, L
     }
   }
 
-private String misplacedItemError(QuestionnaireItemComponent qItem) {
-	return qItem.hasLinkId() ? 
-			String.format("Structural Error: item with linkid %s is in the wrong place", qItem.getLinkId())
-			:
-			"Structural Error: item is in the wrong place";
-}
+  private String misplacedItemError(QuestionnaireItemComponent qItem) {
+  	return qItem.hasLinkId() ? String.format("Structural Error: item with linkid %s is in the wrong place", qItem.getLinkId()) : "Structural Error: item is in the wrong place";
+  }
 
   private void validateQuestionnaireResponseItemQuantity( List<ValidationMessage> errors, Element answer, NodeStack stack)	{