diff --git a/common/lc_global.h b/common/lc_global.h
index 4593cc27..62fafe51 100644
--- a/common/lc_global.h
+++ b/common/lc_global.h
@@ -21,6 +21,7 @@
 #include <functional>
 #include <memory>
 #include <optional>
+#include <unordered_map>
 
 #if _MSC_VER
 #pragma warning(default : 4062) // enumerator 'identifier' in switch of enum 'enumeration' is not handled
diff --git a/common/minifig.cpp b/common/minifig.cpp
index fa783c7b..24cc995f 100644
--- a/common/minifig.cpp
+++ b/common/minifig.cpp
@@ -45,8 +45,14 @@ MinifigWizard::MinifigWizard()
 		Template.ColorCodes[PartIndex] = ColorCodes[PartIndex];
 		Template.Angles[PartIndex] = 0.0f;
 	}
-
-	memset(&mMinifig, 0, sizeof(mMinifig));
+	
+	for (int PartIndex = 0; PartIndex < LC_MFW_NUMITEMS; PartIndex++)
+	{
+		mMinifig.Parts[PartIndex] = nullptr;
+		mMinifig.ColorIndices[PartIndex] = gDefaultColor;
+		mMinifig.Angles[PartIndex] = 0.0f;
+		mMinifig.Matrices[PartIndex] = lcMatrix44Identity();
+	}
 }
 
 MinifigWizard::~MinifigWizard()