diff --git a/CMakeLists.txt b/CMakeLists.txt
index f1577d5f..6f9eb2b9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -135,6 +135,7 @@ add_library(${TARGET_NAME} SHARED
   ${HEADERS}
   ${SOURCES}
   ${MODEL_NAME}/buildDescription.xml
+  ${MODEL_NAME}/FMI${FMI_VERSION}.xml
 )
 
 file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/fmus)
diff --git a/Clocks/FMI3.xml b/Clocks/FMI3.xml
index c08ceb88..f17b7d36 100644
--- a/Clocks/FMI3.xml
+++ b/Clocks/FMI3.xml
@@ -28,7 +28,13 @@
   <Output valueReference="2004" dependencies="1001 1002 1003"/>
   <Output valueReference="2005" dependencies="1002 2006"/>
   <Output valueReference="2007" dependencies="1003"/>
+  <InitialUnknown valueReference="1005"/>
+  <InitialUnknown valueReference="2001"/>
+  <InitialUnknown valueReference="2002"/>
   <InitialUnknown valueReference="2003"/>
+  <InitialUnknown valueReference="2004"/>
+  <InitialUnknown valueReference="2005"/>
+  <InitialUnknown valueReference="2007"/>
  </ModelStructure>
 <!--
 time        0 1 2 3 4 5 6 7 8 9
diff --git a/Feedthrough/FMI2.xml b/Feedthrough/FMI2.xml
index 54eff504..f58d910e 100644
--- a/Feedthrough/FMI2.xml
+++ b/Feedthrough/FMI2.xml
@@ -94,18 +94,18 @@
 
   <ModelStructure>
     <Outputs>
-      <Unknown index="5" dependencies="2 3 4" dependenciesKind="constant constant constant"/>
+      <Unknown index="5" dependencies="4" dependenciesKind="constant"/>
       <Unknown index="7" dependencies="6" dependenciesKind="constant"/>
       <Unknown index="9" dependencies="8" dependenciesKind="constant"/>
-      <Unknown index="11" dependencies="10 12" dependenciesKind="constant"/>
+      <Unknown index="11" dependencies="10" dependenciesKind="constant"/>
       <Unknown index="13" dependencies="12" dependenciesKind="constant"/>
       <Unknown index="15" dependencies="14" dependenciesKind="constant"/>
     </Outputs>
     <InitialUnknowns>
-      <Unknown index="5" dependencies="2 3 4" dependenciesKind="constant constant constant"/>
+      <Unknown index="5" dependencies="4" dependenciesKind="constant"/>
       <Unknown index="7" dependencies="6" dependenciesKind="constant"/>
       <Unknown index="9" dependencies="8" dependenciesKind="constant"/>
-      <Unknown index="11" dependencies="10 12" dependenciesKind="constant"/>
+      <Unknown index="11" dependencies="10" dependenciesKind="constant"/>
       <Unknown index="13" dependencies="12" dependenciesKind="constant"/>
       <Unknown index="15" dependencies="14" dependenciesKind="constant"/>
     </InitialUnknowns>
diff --git a/build/merge_binaries.py b/build/merge_binaries.py
index ff529941..4d70ea52 100644
--- a/build/merge_binaries.py
+++ b/build/merge_binaries.py
@@ -169,6 +169,14 @@ def get_unit(variable):
     os.makedirs(dist_merged / version)
     merge_fmus(version)
 
+# validate the merged FMUs
+for root_dir, _dirs, files in os.walk(dist_merged):
+    for file in files:
+        if file.endswith(".fmu"):
+            fmu_path = os.path.join(root_dir, file)
+            print(f"Validating {file}...")
+            check_call(["fmusim", "validate", fmu_path])
+
 results_dir = root / 'dist-merged' / 'results'
 
 os.makedirs(results_dir, exist_ok=True)