diff --git a/src/external/MusrRoot/MusrRoot.xsd b/src/external/MusrRoot/MusrRoot.xsd
index 81eaab0f..87e89b7f 100644
--- a/src/external/MusrRoot/MusrRoot.xsd
+++ b/src/external/MusrRoot/MusrRoot.xsd
@@ -15,8 +15,10 @@
   
   <xs:complexType name="musrRoot">
     <xs:sequence>
-      <xs:element ref="histos"/>
-      <xs:element name="RunHeader" type="runHeaderFolder"/>
+      <xs:choice>
+        <xs:element ref="histos"/>
+        <xs:element name="RunHeader" type="runHeaderFolder"/>
+      </xs:choice>
       <xs:any processContents="skip" minOccurs="0" maxOccurs="unbounded"/> <!-- here can go any additional stuff you like -->
     </xs:sequence>  
   </xs:complexType>
@@ -100,8 +102,8 @@
       <xs:element name="Generic_Validator_URL" type="TString"/>
       <xs:element name="Specific_Validator_URL" type="TString"/>
       <xs:element name="Generator" type="TString"/>
-      <xs:element name="Proposal Number" type="Int_t" minOccurs="0" maxOccurs="1"/>
-      <xs:element name="Main Proposer" type="TString" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element name="Proposal_Number" type="Int_t" minOccurs="0" maxOccurs="1"/>
+      <xs:element name="Main_Proposer" type="TString" minOccurs="0" maxOccurs="unbounded"/>
       <xs:element name="File_Name" type="TString"/>
       <xs:element name="Run_Title" type="TString"/>
       <xs:element name="Run_Number" type="Int_t"/>
diff --git a/src/external/MusrRoot/MusrRootLEM.xsd b/src/external/MusrRoot/MusrRootLEM.xsd
index 26f66a95..96f3119a 100644
--- a/src/external/MusrRoot/MusrRootLEM.xsd
+++ b/src/external/MusrRoot/MusrRootLEM.xsd
@@ -14,8 +14,10 @@
   
   <xs:complexType name="musrRoot">
     <xs:sequence>
-      <xs:element ref="histos"/>
-      <xs:element name="RunHeader" type="runHeaderFolder"/>
+      <xs:choice>
+        <xs:element ref="histos"/>
+        <xs:element name="RunHeader" type="runHeaderFolder"/>
+      </xs:choice>
       <xs:any processContents="skip" minOccurs="0" maxOccurs="unbounded"/> <!-- here can go any additional stuff you like -->
     </xs:sequence>  
   </xs:complexType>
@@ -101,8 +103,8 @@
       <xs:element name="Generic_Validator_URL" type="TString"/>
       <xs:element name="Specific_Validator_URL" type="TString"/>
       <xs:element name="Generator" type="TString"/>
-      <xs:element name="Proposal Number" type="Int_t" minOccurs="0" maxOccurs="1"/>
-      <xs:element name="Main Proposer" type="TString" minOccurs="0" maxOccurs="unbounded"/>
+      <xs:element name="Proposal_Number" type="Int_t" minOccurs="0" maxOccurs="1"/>
+      <xs:element name="Main_Proposer" type="TString" minOccurs="0" maxOccurs="unbounded"/>
       <xs:element name="File_Name" type="TString"/>
       <xs:element name="Run_Title" type="TString"/>
       <xs:element name="Run_Number" type="Int_t"/>
diff --git a/src/musrRootValidation.cpp b/src/musrRootValidation.cpp
index 24a1151d..cdd169fb 100644
--- a/src/musrRootValidation.cpp
+++ b/src/musrRootValidation.cpp
@@ -8,7 +8,7 @@
 ***************************************************************************/
 
 /***************************************************************************
- *   Copyright (C) 2007-2020 by Andreas Suter                              *
+ *   Copyright (C) 2007-2021 by Andreas Suter                              *
  *   andreas.suter@psi.ch                                                  *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -429,7 +429,7 @@ void PMusrRoot2Xml::CheckClass(TObject *obj, TString str, UInt_t offset)
     offset += 2;
     str = offsetStr + "<" + entryTag + ">";
     fXmlData.push_back(str.Data());
-    DumpEntry(dynamic_cast<TObjArray*>(obj), offset);
+    DumpEntry(dynamic_cast<TObject*>(obj), offset);
     str = offsetStr + "</" + entryTag + ">";
     fXmlData.push_back(str.Data());
   }